diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml index ab1507ad4f..e0d7d92968 100644 --- a/.github/workflows/backend_tests.yml +++ b/.github/workflows/backend_tests.yml @@ -22,14 +22,14 @@ jobs: run: | echo 'package main // This file is auto-generated - DO NOT EDIT - import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/autoscaler" - import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cloudfoundry" - import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfapppush" - import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfappssh" - import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userinvite" - import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/analysis" - import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes" - import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular"' > src/jetstream/extra_plugins.go + import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/autoscaler" + import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cloudfoundry" + import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cfapppush" + import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cfappssh" + import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/userinvite" + import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/analysis" + import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes" + import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular"' > src/jetstream/extra_plugins.go - name: Run tests run: build/bk-build.sh test diff --git a/.gitignore b/.gitignore index b9d310b770..4323838499 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /tmp /out-tsc /out +/jetstream # dependencies /node_modules diff --git a/README.md b/README.md index 6ada219682..df349a509f 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,19 @@ # Stratos -  - + + -[![GitHub release](https://img.shields.io/github/release/cloudfoundry-community/stratos.svg)](https://github.com/cloudfoundry-community/stratos/releases/latest) -[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/cloudfoundry-community/stratos/blob/master/LICENSE) +[![GitHub release](https://img.shields.io/github/release/cloudfoundry-community/stratos.svg)](https://github.com/cloudfoundry/stratos/releases/latest) +[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/cloudfoundry/stratos/blob/master/LICENSE) [![slack.cloudfoundry.org](https://slack.cloudfoundry.org/badge.svg)](https://cloudfoundry.slack.com/messages/C80EP4Y57/) +(Please note: The official repository is at cloudfoundry/stratos and the cloudfoundry-community/stratos will track this but may be used for some testing purposes) + Stratos is an Open Source Web-based UI (Console) for managing Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks. ![Stratos Application view](website/static/images/screenshots/app-summary.png) -Please visit our new [documentation site](https://stratos.app/). There you can discover +Please visit our new [documentation site](https://stratos.app/). There you can discover (* This is currently being updated from the 4.4.0 docs) 1. Our [introduction](https://stratos.app/docs/), including quick start, contributing and troubleshooting guides. 1. How to [deploy](https://stratos.app/docs/deploy/overview) Stratos in a number of environments. @@ -33,11 +35,11 @@ Tested with Browserstack This feature helps in pre-building the -[Stratos](https://github.com/cloudfoundry-community/stratos) web application +[Stratos](https://github.com/cloudfoundry/stratos) web application so that it can be deployed faster in Cloud Foundry, or be run offline. You can find pre-built versions of Stratos UI in the -[releases](https://github.com/cloudfoundry-community/stratos/releases) +[releases](https://github.com/cloudfoundry/stratos/releases) of this repository. To run those `.zip` packages inside Cloud Foundry, unzip it, write a manifest, @@ -67,10 +69,10 @@ Note: `sgs` creates security groups the first time, upgrades do not use `sgs`. ## Packaging -Golang is required, and version 1.12 is recommended as this is the version used by the Stratos build system. +Golang is required, and version 1.21 is recommended as this is the version used by the Stratos build system. -When you want to build the `4.1.2` tag in -[Stratos UI releases](https://github.com/cloudfoundry-community/stratos/releases), +When you want to build the `4.8.1` tag in +[Stratos UI releases](https://github.com/cloudfoundry/stratos/releases), run this command: ```bash @@ -78,7 +80,7 @@ run this command: ``` OR to package a specific tag ```bash -TAG="4.1.2" ./bin/package +TAG="4.8.1" ./bin/package ``` ### NOTE diff --git a/bin/package b/bin/package index 5cf034b9eb..a292e696b1 100755 --- a/bin/package +++ b/bin/package @@ -6,7 +6,7 @@ set -xeuo pipefail declare git_url git_tag work_dir declare -x TAG NODE_VERSION TMP_DIR -git_url="https://github.com/cloudfoundry-community/stratos.git" +git_url="https://github.com/cloudfoundry/stratos.git" git_tag="${TAG:-develop}" work_dir="${PWD}" NODE_VERSION="${NODE_VERISON:-20.13.1}" diff --git a/deploy/cloud-foundry/build.sh b/deploy/cloud-foundry/build.sh index f346b11681..077371de55 100755 --- a/deploy/cloud-foundry/build.sh +++ b/deploy/cloud-foundry/build.sh @@ -10,7 +10,7 @@ YELLOW="\033[93m" RESET="\033[0m" BOLD="\033[1m" -VENDOR_FOLDER=tmp/go/src/github.com/cloudfoundry-community/stratos/vendor +VENDOR_FOLDER=tmp/go/src/github.com/cloudfoundry/stratos/vendor function log { COLOR=${2:-} diff --git a/manifest.yml b/manifest.yml index 2f444803d9..5c7f18eb08 100644 --- a/manifest.yml +++ b/manifest.yml @@ -4,7 +4,7 @@ applications: disk_quota: 1024M host: console timeout: 180 - buildpack: https://github.com/cloudfoundry-community/stratos-buildpack#v5 + buildpack: https://github.com/cloudfoundry/stratos-buildpack#v5 health-check-type: port # env: # Override CF API endpoint URL inferred from VCAP_APPLICATION env diff --git a/package-lock.json b/package-lock.json index d12259ae37..75a8bbb2ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "stratos", - "version": "4.8.0", + "version": "4.8.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "stratos", - "version": "4.8.0", + "version": "4.8.1", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 3e4d88f238..3671b38bf0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stratos", - "version": "4.8.0", + "version": "4.8.1", "description": "Stratos Console", "main": "index.js", "scripts": { diff --git a/src/frontend/packages/devkit/src/backend.ts b/src/frontend/packages/devkit/src/backend.ts index 685c5c8f65..eaae05196d 100644 --- a/src/frontend/packages/devkit/src/backend.ts +++ b/src/frontend/packages/devkit/src/backend.ts @@ -23,7 +23,7 @@ if (backendPlugins.length === 0) { // Check that the plugin exists if (fs.existsSync(path.join(backendFolder, 'plugins', pkg))) { - fs.appendFileSync(backendPluginsFile, `import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/${pkg}"\n`); + fs.appendFileSync(backendPluginsFile, `import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/${pkg}"\n`); console.log(` + ${pkg}`) } else { console.log(` + ${pkg} : WARNING: Backend plugin does not exist`); diff --git a/src/jetstream/api/go.mod b/src/jetstream/api/go.mod index dad0dec46e..64e7d7aaf9 100644 --- a/src/jetstream/api/go.mod +++ b/src/jetstream/api/go.mod @@ -1,4 +1,4 @@ -module github.com/cloudfoundry-community/stratos/src/jetstream/api +module github.com/cloudfoundry/stratos/src/jetstream/api go 1.21 diff --git a/src/jetstream/api/mock/mock_auth.go b/src/jetstream/api/mock/mock_auth.go index 894d9f7806..3d94433725 100644 --- a/src/jetstream/api/mock/mock_auth.go +++ b/src/jetstream/api/mock/mock_auth.go @@ -7,7 +7,7 @@ package mock_api import ( reflect "reflect" - api "github.com/cloudfoundry-community/stratos/src/jetstream/api" + api "github.com/cloudfoundry/stratos/src/jetstream/api" gomock "github.com/golang/mock/gomock" echo "github.com/labstack/echo/v4" ) diff --git a/src/jetstream/api/structs.go b/src/jetstream/api/structs.go index c4a9119fb5..49a508e01c 100644 --- a/src/jetstream/api/structs.go +++ b/src/jetstream/api/structs.go @@ -6,7 +6,7 @@ import ( "net/url" "reflect" - api "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" + api "github.com/cloudfoundry/stratos/src/jetstream/api/config" "github.com/gorilla/sessions" "github.com/labstack/echo/v4" ) diff --git a/src/jetstream/apikeys.go b/src/jetstream/apikeys.go index 381f697d83..8020f20b13 100644 --- a/src/jetstream/apikeys.go +++ b/src/jetstream/apikeys.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/apikeys_test.go b/src/jetstream/apikeys_test.go index 19a88f91a7..fbd9403826 100644 --- a/src/jetstream/apikeys_test.go +++ b/src/jetstream/apikeys_test.go @@ -6,10 +6,10 @@ import ( "net/http" "testing" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" - mock_api "github.com/cloudfoundry-community/stratos/src/jetstream/api/mock" - mock_apikeys "github.com/cloudfoundry-community/stratos/src/jetstream/repository/apikeys/mock" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" + mock_api "github.com/cloudfoundry/stratos/src/jetstream/api/mock" + mock_apikeys "github.com/cloudfoundry/stratos/src/jetstream/repository/apikeys/mock" "github.com/golang/mock/gomock" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/auth.go b/src/jetstream/auth.go index 2a34d222b5..e0745219ce 100644 --- a/src/jetstream/auth.go +++ b/src/jetstream/auth.go @@ -9,7 +9,7 @@ import ( "github.com/labstack/echo/v4" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // LoginHookFunc - function that can be hooked into a successful user login diff --git a/src/jetstream/auth_providers.go b/src/jetstream/auth_providers.go index 26c02cbf04..2040b9e2d5 100644 --- a/src/jetstream/auth_providers.go +++ b/src/jetstream/auth_providers.go @@ -1,6 +1,6 @@ package main -import "github.com/cloudfoundry-community/stratos/src/jetstream/api" +import "github.com/cloudfoundry/stratos/src/jetstream/api" // log "github.com/sirupsen/logrus" diff --git a/src/jetstream/auth_test.go b/src/jetstream/auth_test.go index 84c78f891a..1d2aac4ea5 100644 --- a/src/jetstream/auth_test.go +++ b/src/jetstream/auth_test.go @@ -18,12 +18,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" - mock_api "github.com/cloudfoundry-community/stratos/src/jetstream/api/mock" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-community/stratos/src/jetstream/testutils" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" + mock_api "github.com/cloudfoundry/stratos/src/jetstream/api/mock" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/testutils" . "github.com/smartystreets/goconvey/convey" ) diff --git a/src/jetstream/authcnsi.go b/src/jetstream/authcnsi.go index 10cc07326a..452e2d8647 100644 --- a/src/jetstream/authcnsi.go +++ b/src/jetstream/authcnsi.go @@ -11,9 +11,9 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/tokens" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" + "github.com/cloudfoundry/stratos/src/jetstream/repository/tokens" ) // CFAdminIdentifier - The scope that Cloud Foundry uses to convey administrative level perms diff --git a/src/jetstream/authlocal.go b/src/jetstream/authlocal.go index 50a89ba6c1..69873200f2 100644 --- a/src/jetstream/authlocal.go +++ b/src/jetstream/authlocal.go @@ -14,9 +14,9 @@ import ( "github.com/labstack/echo/v4" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/localusers" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/repository/localusers" ) // More fields will be moved into here as global portalProxy struct is phased out diff --git a/src/jetstream/authnone.go b/src/jetstream/authnone.go index 41410c1d00..3fb7698641 100644 --- a/src/jetstream/authnone.go +++ b/src/jetstream/authnone.go @@ -11,7 +11,7 @@ import ( "github.com/labstack/echo/v4" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) const ( diff --git a/src/jetstream/authuaa.go b/src/jetstream/authuaa.go index 2da0cdac7e..3fa5cc9615 100644 --- a/src/jetstream/authuaa.go +++ b/src/jetstream/authuaa.go @@ -15,8 +15,8 @@ import ( "github.com/labstack/echo/v4" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/stringutils" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/stringutils" ) // UAAAdminIdentifier - The identifier that UAA uses to convey administrative level perms diff --git a/src/jetstream/cnsi.go b/src/jetstream/cnsi.go index ba06736880..e8d69efc33 100644 --- a/src/jetstream/cnsi.go +++ b/src/jetstream/cnsi.go @@ -16,9 +16,9 @@ import ( "crypto/sha1" "encoding/base64" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userfavorites/userfavoritesendpoints" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/userfavorites/userfavoritesendpoints" ) const dbReferenceError = "unable to establish a database reference: '%v'" diff --git a/src/jetstream/cnsi_test.go b/src/jetstream/cnsi_test.go index 92fe618a4a..928dc371b9 100644 --- a/src/jetstream/cnsi_test.go +++ b/src/jetstream/cnsi_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" - mock_api "github.com/cloudfoundry-community/stratos/src/jetstream/api/mock" - "github.com/cloudfoundry-community/stratos/src/jetstream/testutils" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" + mock_api "github.com/cloudfoundry/stratos/src/jetstream/api/mock" + "github.com/cloudfoundry/stratos/src/jetstream/testutils" "github.com/golang/mock/gomock" _ "github.com/satori/go.uuid" . "github.com/smartystreets/goconvey/convey" diff --git a/src/jetstream/custom_errors/custom_errors.go b/src/jetstream/custom_errors/custom_errors.go index 7cd694bfea..aee4428885 100644 --- a/src/jetstream/custom_errors/custom_errors.go +++ b/src/jetstream/custom_errors/custom_errors.go @@ -3,7 +3,7 @@ package custom_errors import ( "fmt" - "github.com/cloudfoundry-community/stratos/src/jetstream/custom_errors/constants" + "github.com/cloudfoundry/stratos/src/jetstream/custom_errors/constants" ) type GooseDBNoDatabaseVersionsFoundError struct{} diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go index 24c9f1bb07..618450ba47 100644 --- a/src/jetstream/datastore/datastore.go +++ b/src/jetstream/datastore/datastore.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/custom_errors" + "github.com/cloudfoundry/stratos/src/jetstream/custom_errors" "github.com/samber/lo" - goosedbversion "github.com/cloudfoundry-community/stratos/src/jetstream/repository/goose-db-version" + goosedbversion "github.com/cloudfoundry/stratos/src/jetstream/repository/goose-db-version" "github.com/govau/cf-common/env" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/default_plugins.go b/src/jetstream/default_plugins.go index 435ccbc4ea..af93afd25f 100644 --- a/src/jetstream/default_plugins.go +++ b/src/jetstream/default_plugins.go @@ -3,9 +3,9 @@ package main // These imports bring in the default set of plugins import ( - _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/backup" - _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cloudfoundryhosting" - _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/metrics" - _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userfavorites" - _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userinfo" + _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/backup" + _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cloudfoundryhosting" + _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/metrics" + _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/userfavorites" + _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/userinfo" ) diff --git a/src/jetstream/diagnostics.go b/src/jetstream/diagnostics.go index 0f5b6f88eb..e5773d8266 100644 --- a/src/jetstream/diagnostics.go +++ b/src/jetstream/diagnostics.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - goosedbversion "github.com/cloudfoundry-community/stratos/src/jetstream/repository/goose-db-version" + "github.com/cloudfoundry/stratos/src/jetstream/api" + goosedbversion "github.com/cloudfoundry/stratos/src/jetstream/repository/goose-db-version" ) func (p *portalProxy) StoreDiagnostics() { diff --git a/src/jetstream/factory/factory.go b/src/jetstream/factory/factory.go index cd6d2d7931..7c8d7189f1 100644 --- a/src/jetstream/factory/factory.go +++ b/src/jetstream/factory/factory.go @@ -3,9 +3,9 @@ package factory import ( "database/sql" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/cnsis" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/tokens" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/repository/cnsis" + "github.com/cloudfoundry/stratos/src/jetstream/repository/tokens" ) // DefaultStoreFactory is default factory for getting store interfaces diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod index e5d74700e7..7f355a9fbe 100644 --- a/src/jetstream/go.mod +++ b/src/jetstream/go.mod @@ -1,20 +1,20 @@ -module github.com/cloudfoundry-community/stratos/src/jetstream +module github.com/cloudfoundry/stratos/src/jetstream go 1.21 toolchain go1.21.9 replace ( - github.com/cloudfoundry-community/stratos/src/jetstream/api => ./api - github.com/cloudfoundry-community/stratos/src/jetstream/api/config => ./api/config - github.com/cloudfoundry-community/stratos/src/jetstream/crypto => ./crypto - github.com/cloudfoundry-community/stratos/src/jetstream/docs => ./docs - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfapppush => ./plugins/cfapppush - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cloudfoundry => ./plugins/cloudfoundry - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes => ./plugins/kubernetes - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth => ./plugins/kubernetes/auth - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/terminal => ./plugins/kubernetes/terminal - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular => ./plugins/monocular + github.com/cloudfoundry/stratos/src/jetstream/api => ./api + github.com/cloudfoundry/stratos/src/jetstream/api/config => ./api/config + github.com/cloudfoundry/stratos/src/jetstream/crypto => ./crypto + github.com/cloudfoundry/stratos/src/jetstream/docs => ./docs + github.com/cloudfoundry/stratos/src/jetstream/plugins/cfapppush => ./plugins/cfapppush + github.com/cloudfoundry/stratos/src/jetstream/plugins/cloudfoundry => ./plugins/cloudfoundry + github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes => ./plugins/kubernetes + github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth => ./plugins/kubernetes/auth + github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/terminal => ./plugins/kubernetes/terminal + github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular => ./plugins/monocular ) // ported from plugins/kubernetes @@ -31,11 +31,11 @@ require ( github.com/antonlindstrom/pgstore v0.0.0-20220421113606-e3a6e3fed12a github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13 github.com/cloudfoundry-community/go-cfenv v1.18.0 - github.com/cloudfoundry-community/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfapppush v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes v0.0.0-20210416105629-f34f428ca775 - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular v0.0.0-20210416105629-f34f428ca775 + github.com/cloudfoundry/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream/plugins/cfapppush v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes v0.0.0-20210416105629-f34f428ca775 + github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular v0.0.0-20210416105629-f34f428ca775 github.com/cloudfoundry/noaa/v2 v2.3.0 github.com/cloudfoundry/sonde-go v0.0.0-20230911203642-fa89d986ae20 github.com/domodwyer/mailyak v3.1.1+incompatible diff --git a/src/jetstream/http_basic_requests.go b/src/jetstream/http_basic_requests.go index ff5135b04c..e8dab12a68 100644 --- a/src/jetstream/http_basic_requests.go +++ b/src/jetstream/http_basic_requests.go @@ -7,7 +7,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) func (p *portalProxy) doHttpBasicFlowRequest(cnsiRequest *api.CNSIRequest, req *http.Request) (*http.Response, error) { diff --git a/src/jetstream/info.go b/src/jetstream/info.go index 19e534c2d0..4ca6a2fe53 100644 --- a/src/jetstream/info.go +++ b/src/jetstream/info.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/jwt.go b/src/jetstream/jwt.go index 3e1cb34ebb..2385a08fa6 100644 --- a/src/jetstream/jwt.go +++ b/src/jetstream/jwt.go @@ -8,7 +8,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) func (p *portalProxy) GetUserTokenInfo(tok string) (u *api.JWTUserTokenInfo, err error) { diff --git a/src/jetstream/load_plugins.go b/src/jetstream/load_plugins.go index d6a51a2e4e..03a75ce489 100644 --- a/src/jetstream/load_plugins.go +++ b/src/jetstream/load_plugins.go @@ -1,10 +1,10 @@ package main import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/yamlgenerated" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/yamlgenerated" ) func (pp *portalProxy) loadPlugins() { diff --git a/src/jetstream/localusers.go b/src/jetstream/localusers.go index c25a1454f1..227257395b 100644 --- a/src/jetstream/localusers.go +++ b/src/jetstream/localusers.go @@ -7,9 +7,9 @@ import ( uuid "github.com/satori/go.uuid" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/localusers" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/repository/localusers" ) func (p *portalProxy) FindUserGUID(c echo.Context) (string, error) { diff --git a/src/jetstream/localusers_test.go b/src/jetstream/localusers_test.go index c63233a400..3a93216758 100644 --- a/src/jetstream/localusers_test.go +++ b/src/jetstream/localusers_test.go @@ -9,9 +9,9 @@ import ( log "github.com/sirupsen/logrus" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/localusers" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/repository/localusers" . "github.com/smartystreets/goconvey/convey" ) diff --git a/src/jetstream/main.go b/src/jetstream/main.go index 2b0b2ae717..624baab76c 100644 --- a/src/jetstream/main.go +++ b/src/jetstream/main.go @@ -20,8 +20,8 @@ import ( "syscall" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/custombinder" - _ "github.com/cloudfoundry-community/stratos/src/jetstream/docs" + "github.com/cloudfoundry/stratos/src/jetstream/custombinder" + _ "github.com/cloudfoundry/stratos/src/jetstream/docs" "github.com/antonlindstrom/pgstore" "github.com/cf-stratos/mysqlstore" @@ -35,17 +35,17 @@ import ( log "github.com/sirupsen/logrus" echoSwagger "github.com/swaggo/echo-swagger" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-community/stratos/src/jetstream/factory" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/apikeys" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/cnsis" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/console_config" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/localusers" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/sessiondata" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/tokens" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/factory" + "github.com/cloudfoundry/stratos/src/jetstream/repository/apikeys" + "github.com/cloudfoundry/stratos/src/jetstream/repository/cnsis" + "github.com/cloudfoundry/stratos/src/jetstream/repository/console_config" + "github.com/cloudfoundry/stratos/src/jetstream/repository/localusers" + "github.com/cloudfoundry/stratos/src/jetstream/repository/sessiondata" + "github.com/cloudfoundry/stratos/src/jetstream/repository/tokens" ) // @title Stratos API diff --git a/src/jetstream/main_test.go b/src/jetstream/main_test.go index fd06817f66..ca53ac15f2 100644 --- a/src/jetstream/main_test.go +++ b/src/jetstream/main_test.go @@ -5,8 +5,8 @@ import ( "github.com/govau/cf-common/env" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" ) // DO NOT DELETE - this is necessary for thr HTTP Client used during unit tests diff --git a/src/jetstream/middleware.go b/src/jetstream/middleware.go index 03e048382b..44ac3b96c4 100644 --- a/src/jetstream/middleware.go +++ b/src/jetstream/middleware.go @@ -16,8 +16,8 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" ) const cfSessionCookieName = "JSESSIONID" diff --git a/src/jetstream/middleware_test.go b/src/jetstream/middleware_test.go index 9d0352b694..227a625167 100644 --- a/src/jetstream/middleware_test.go +++ b/src/jetstream/middleware_test.go @@ -8,12 +8,12 @@ import ( "net/http/httptest" "testing" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" - mock_api "github.com/cloudfoundry-community/stratos/src/jetstream/api/mock" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/apikeys" - mock_apikeys "github.com/cloudfoundry-community/stratos/src/jetstream/repository/apikeys/mock" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" + mock_api "github.com/cloudfoundry/stratos/src/jetstream/api/mock" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/repository/apikeys" + mock_apikeys "github.com/cloudfoundry/stratos/src/jetstream/repository/apikeys/mock" "github.com/golang/mock/gomock" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/mock_server_test.go b/src/jetstream/mock_server_test.go index 8a53c3f763..e321914169 100644 --- a/src/jetstream/mock_server_test.go +++ b/src/jetstream/mock_server_test.go @@ -20,13 +20,13 @@ import ( "github.com/labstack/echo/v4" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-community/stratos/src/jetstream/factory" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/tokens" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/factory" + "github.com/cloudfoundry/stratos/src/jetstream/repository/tokens" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cloudfoundry" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/cloudfoundry" ) type mockServer struct { diff --git a/src/jetstream/noauth_requests.go b/src/jetstream/noauth_requests.go index a750cf1f24..c66ef46ff4 100644 --- a/src/jetstream/noauth_requests.go +++ b/src/jetstream/noauth_requests.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/oauth_requests.go b/src/jetstream/oauth_requests.go index 030c428e42..2555803071 100644 --- a/src/jetstream/oauth_requests.go +++ b/src/jetstream/oauth_requests.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/oauth_requests_test.go b/src/jetstream/oauth_requests_test.go index d9982ad816..950b3dd6bc 100644 --- a/src/jetstream/oauth_requests_test.go +++ b/src/jetstream/oauth_requests_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/testutils" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/testutils" . "github.com/smartystreets/goconvey/convey" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/src/jetstream/oidc_requests.go b/src/jetstream/oidc_requests.go index 1fbd0be98e..4e8e953e01 100644 --- a/src/jetstream/oidc_requests.go +++ b/src/jetstream/oidc_requests.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go index 6198d0b946..42f941d74b 100644 --- a/src/jetstream/passthrough.go +++ b/src/jetstream/passthrough.go @@ -15,7 +15,7 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // API Host Prefix to replace if the custom header is supplied diff --git a/src/jetstream/passthrough_test.go b/src/jetstream/passthrough_test.go index e5d2d21e6a..a79f6692dd 100644 --- a/src/jetstream/passthrough_test.go +++ b/src/jetstream/passthrough_test.go @@ -9,8 +9,8 @@ import ( . "github.com/smartystreets/goconvey/convey" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/testutils" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/testutils" ) func TestPassthroughDoRequest(t *testing.T) { diff --git a/src/jetstream/plugins/analysis/container/sonobuoy.go_ b/src/jetstream/plugins/analysis/container/sonobuoy.go_ index ac1029fdbb..184dbddcc1 100644 --- a/src/jetstream/plugins/analysis/container/sonobuoy.go_ +++ b/src/jetstream/plugins/analysis/container/sonobuoy.go_ @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/analysis/store" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/analysis/store" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/analysis/list.go b/src/jetstream/plugins/analysis/list.go index 47f679dcc1..47ea3c56ee 100644 --- a/src/jetstream/plugins/analysis/list.go +++ b/src/jetstream/plugins/analysis/list.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/analysis/store" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/analysis/store" "github.com/labstack/echo/v4" diff --git a/src/jetstream/plugins/analysis/main.go b/src/jetstream/plugins/analysis/main.go index 587e0500b1..58d20054e0 100644 --- a/src/jetstream/plugins/analysis/main.go +++ b/src/jetstream/plugins/analysis/main.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/analysis/store" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/analysis/store" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/analysis/run.go b/src/jetstream/plugins/analysis/run.go index 5cb048a77e..0cce25e4da 100644 --- a/src/jetstream/plugins/analysis/run.go +++ b/src/jetstream/plugins/analysis/run.go @@ -11,7 +11,7 @@ import ( "net/textproto" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/analysis/store" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/analysis/store" "github.com/labstack/echo/v4" uuid "github.com/satori/go.uuid" diff --git a/src/jetstream/plugins/analysis/status.go b/src/jetstream/plugins/analysis/status.go index 3fac589e77..9c3343278a 100644 --- a/src/jetstream/plugins/analysis/status.go +++ b/src/jetstream/plugins/analysis/status.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/analysis/store" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/analysis/store" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/analysis/store/analysis_store_db.go b/src/jetstream/plugins/analysis/store/analysis_store_db.go index b1cf4bbe98..790633f427 100644 --- a/src/jetstream/plugins/analysis/store/analysis_store_db.go +++ b/src/jetstream/plugins/analysis/store/analysis_store_db.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" ) var ( diff --git a/src/jetstream/plugins/autoscaler/main.go b/src/jetstream/plugins/autoscaler/main.go index bd74b8f06b..70cbe31a85 100644 --- a/src/jetstream/plugins/autoscaler/main.go +++ b/src/jetstream/plugins/autoscaler/main.go @@ -3,7 +3,7 @@ package autoscaler import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" ) diff --git a/src/jetstream/plugins/backup/backup_restore.go b/src/jetstream/plugins/backup/backup_restore.go index 078992328f..516ed78dd2 100644 --- a/src/jetstream/plugins/backup/backup_restore.go +++ b/src/jetstream/plugins/backup/backup_restore.go @@ -8,8 +8,8 @@ import ( "io/ioutil" "net/http" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/backup/main.go b/src/jetstream/plugins/backup/main.go index b37256c369..24827c17b8 100644 --- a/src/jetstream/plugins/backup/main.go +++ b/src/jetstream/plugins/backup/main.go @@ -6,8 +6,8 @@ import ( "net/http" "strconv" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - goosedbversion "github.com/cloudfoundry-community/stratos/src/jetstream/repository/goose-db-version" + "github.com/cloudfoundry/stratos/src/jetstream/api" + goosedbversion "github.com/cloudfoundry/stratos/src/jetstream/repository/goose-db-version" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/cfapppush/connection_wrapper.go b/src/jetstream/plugins/cfapppush/connection_wrapper.go index 123e8f3184..9c00c53a17 100644 --- a/src/jetstream/plugins/cfapppush/connection_wrapper.go +++ b/src/jetstream/plugins/cfapppush/connection_wrapper.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller" "code.cloudfoundry.org/cli/command" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // PushConnectionWrapper can wrap a given connection allowing the wrapper to modify diff --git a/src/jetstream/plugins/cfapppush/deploy.go b/src/jetstream/plugins/cfapppush/deploy.go index b703ba10eb..d5081279b1 100644 --- a/src/jetstream/plugins/cfapppush/deploy.go +++ b/src/jetstream/plugins/cfapppush/deploy.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/gorilla/websocket" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/cfapppush/go.mod b/src/jetstream/plugins/cfapppush/go.mod index ba361d74fa..004ca98e28 100644 --- a/src/jetstream/plugins/cfapppush/go.mod +++ b/src/jetstream/plugins/cfapppush/go.mod @@ -1,9 +1,9 @@ -module github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfapppush +module github.com/cloudfoundry/stratos/src/jetstream/plugins/cfapppush go 1.21 replace ( - github.com/cloudfoundry-community/stratos/src/jetstream/api => ../../api + github.com/cloudfoundry/stratos/src/jetstream/api => ../../api github.com/cloudfoundry/cli-plugin-repo => code.cloudfoundry.org/cli-plugin-repo v0.0.0-20230525012251-b9c89116786e github.com/moby/moby => github.com/moby/moby v20.10.25+incompatible github.com/sabhiram/go-gitignore => github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 @@ -13,7 +13,7 @@ replace ( require ( code.cloudfoundry.org/cli v0.0.0-20230912192837-efd1d03e7292 code.cloudfoundry.org/clock v1.1.0 - github.com/cloudfoundry-community/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 github.com/gorilla/websocket v1.5.0 github.com/labstack/echo/v4 v4.11.1 github.com/mholt/archiver/v3 v3.5.1 diff --git a/src/jetstream/plugins/cfapppush/info.go b/src/jetstream/plugins/cfapppush/info.go index 3b2991b8b9..f02ccdb57b 100644 --- a/src/jetstream/plugins/cfapppush/info.go +++ b/src/jetstream/plugins/cfapppush/info.go @@ -3,7 +3,7 @@ package cfapppush import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "code.cloudfoundry.org/cli/util/configv3" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/cfapppush/main.go b/src/jetstream/plugins/cfapppush/main.go index 05ba83e4cf..89d3e8e4a5 100644 --- a/src/jetstream/plugins/cfapppush/main.go +++ b/src/jetstream/plugins/cfapppush/main.go @@ -3,7 +3,7 @@ package cfapppush import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" ) diff --git a/src/jetstream/plugins/cfapppush/pushapp.go b/src/jetstream/plugins/cfapppush/pushapp.go index dc958596af..c356ce518f 100644 --- a/src/jetstream/plugins/cfapppush/pushapp.go +++ b/src/jetstream/plugins/cfapppush/pushapp.go @@ -29,7 +29,7 @@ import ( v7 "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/shared" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // CFPushApp abstracts the push functionality form the CLI library diff --git a/src/jetstream/plugins/cfappssh/app_ssh.go b/src/jetstream/plugins/cfappssh/app_ssh.go index 61c36e6e4f..e145ff2d6f 100644 --- a/src/jetstream/plugins/cfappssh/app_ssh.go +++ b/src/jetstream/plugins/cfappssh/app_ssh.go @@ -11,7 +11,7 @@ import ( "net/url" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/gorilla/websocket" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/cfappssh/main.go b/src/jetstream/plugins/cfappssh/main.go index 8c4b531451..cdc0d91c63 100644 --- a/src/jetstream/plugins/cfappssh/main.go +++ b/src/jetstream/plugins/cfappssh/main.go @@ -3,7 +3,7 @@ package cfappssh import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" ) diff --git a/src/jetstream/plugins/cloudfoundry/cf_websocket_streams.go b/src/jetstream/plugins/cloudfoundry/cf_websocket_streams.go index 19a54af52e..58cf15cdc7 100644 --- a/src/jetstream/plugins/cloudfoundry/cf_websocket_streams.go +++ b/src/jetstream/plugins/cloudfoundry/cf_websocket_streams.go @@ -13,9 +13,9 @@ import ( logcache "code.cloudfoundry.org/go-log-cache" "code.cloudfoundry.org/go-log-cache/rpc/logcache_v1" "code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" "github.com/cloudfoundry/noaa/v2/consumer" "github.com/cloudfoundry/sonde-go/events" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/gorilla/websocket" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/cloudfoundry/main.go b/src/jetstream/plugins/cloudfoundry/main.go index 3694370e53..801a4159a2 100644 --- a/src/jetstream/plugins/cloudfoundry/main.go +++ b/src/jetstream/plugins/cloudfoundry/main.go @@ -10,7 +10,7 @@ import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/cloudfoundryhosting/main.go b/src/jetstream/plugins/cloudfoundryhosting/main.go index d3faf45754..6b53f63cec 100644 --- a/src/jetstream/plugins/cloudfoundryhosting/main.go +++ b/src/jetstream/plugins/cloudfoundryhosting/main.go @@ -15,7 +15,7 @@ import ( uuid "github.com/satori/go.uuid" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // Constants diff --git a/src/jetstream/plugins/desktop/cloudfoundry.go b/src/jetstream/plugins/desktop/cloudfoundry.go index 27b940a039..99b03201c7 100644 --- a/src/jetstream/plugins/desktop/cloudfoundry.go +++ b/src/jetstream/plugins/desktop/cloudfoundry.go @@ -9,7 +9,7 @@ import ( "os/user" "path/filepath" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // CFConfigFile represents the data we need for CF config file diff --git a/src/jetstream/plugins/desktop/endpoints.go b/src/jetstream/plugins/desktop/endpoints.go index 865f222703..269581370d 100644 --- a/src/jetstream/plugins/desktop/endpoints.go +++ b/src/jetstream/plugins/desktop/endpoints.go @@ -4,7 +4,7 @@ import ( "crypto/sha1" "encoding/base64" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/desktop/helm/endpoints.go b/src/jetstream/plugins/desktop/helm/endpoints.go index e3acb557be..60af53ea0b 100644 --- a/src/jetstream/plugins/desktop/helm/endpoints.go +++ b/src/jetstream/plugins/desktop/helm/endpoints.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/desktop/helm/main.go b/src/jetstream/plugins/desktop/helm/main.go index e6b30afde1..060e650b15 100644 --- a/src/jetstream/plugins/desktop/helm/main.go +++ b/src/jetstream/plugins/desktop/helm/main.go @@ -3,7 +3,7 @@ package helm import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/desktop/helm/repositories.go b/src/jetstream/plugins/desktop/helm/repositories.go index 1875064f83..b060da2795 100644 --- a/src/jetstream/plugins/desktop/helm/repositories.go +++ b/src/jetstream/plugins/desktop/helm/repositories.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/desktop/helm/tokens.go b/src/jetstream/plugins/desktop/helm/tokens.go index d1f2fbad5b..9385450730 100644 --- a/src/jetstream/plugins/desktop/helm/tokens.go +++ b/src/jetstream/plugins/desktop/helm/tokens.go @@ -1,7 +1,7 @@ package helm import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // TokenStore is a token store that combines local tokens with the usual database stored tokens diff --git a/src/jetstream/plugins/desktop/kubernetes/auth.go b/src/jetstream/plugins/desktop/kubernetes/auth.go index 0961dc1efc..2590389925 100644 --- a/src/jetstream/plugins/desktop/kubernetes/auth.go +++ b/src/jetstream/plugins/desktop/kubernetes/auth.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/src/jetstream/plugins/desktop/kubernetes/endpoints.go b/src/jetstream/plugins/desktop/kubernetes/endpoints.go index 2071094623..a47d0e8118 100644 --- a/src/jetstream/plugins/desktop/kubernetes/endpoints.go +++ b/src/jetstream/plugins/desktop/kubernetes/endpoints.go @@ -4,7 +4,7 @@ import ( "crypto/sha1" "encoding/base64" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/desktop/kubernetes/kubeconfig.go b/src/jetstream/plugins/desktop/kubernetes/kubeconfig.go index d5ff9b874c..b6d9c805a6 100644 --- a/src/jetstream/plugins/desktop/kubernetes/kubeconfig.go +++ b/src/jetstream/plugins/desktop/kubernetes/kubeconfig.go @@ -9,7 +9,7 @@ import ( "os/user" "path/filepath" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" "k8s.io/client-go/tools/clientcmd" diff --git a/src/jetstream/plugins/desktop/kubernetes/main.go b/src/jetstream/plugins/desktop/kubernetes/main.go index aad6b9e48d..1345bdf697 100644 --- a/src/jetstream/plugins/desktop/kubernetes/main.go +++ b/src/jetstream/plugins/desktop/kubernetes/main.go @@ -1,7 +1,7 @@ package kubernetes import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/desktop/kubernetes/tokens.go b/src/jetstream/plugins/desktop/kubernetes/tokens.go index bc855a710b..8dcbc792d4 100644 --- a/src/jetstream/plugins/desktop/kubernetes/tokens.go +++ b/src/jetstream/plugins/desktop/kubernetes/tokens.go @@ -1,7 +1,7 @@ package kubernetes import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // TokenStore is a token store that combines local tokens with the usual database stored tokens diff --git a/src/jetstream/plugins/desktop/main.go b/src/jetstream/plugins/desktop/main.go index f0c26a88c3..ecae89962d 100644 --- a/src/jetstream/plugins/desktop/main.go +++ b/src/jetstream/plugins/desktop/main.go @@ -3,9 +3,9 @@ package desktop import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/desktop/helm" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/desktop/kubernetes" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/desktop/helm" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/desktop/kubernetes" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/desktop/tokens.go b/src/jetstream/plugins/desktop/tokens.go index af06258247..a2c2c69fc1 100644 --- a/src/jetstream/plugins/desktop/tokens.go +++ b/src/jetstream/plugins/desktop/tokens.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // TokenStore is a token store that combines local tokens with the usual database stored tokens diff --git a/src/jetstream/plugins/kubernetes/api/api.go b/src/jetstream/plugins/kubernetes/api/api.go index eaae1c55f5..fa16bfe458 100644 --- a/src/jetstream/plugins/kubernetes/api/api.go +++ b/src/jetstream/plugins/kubernetes/api/api.go @@ -1,7 +1,7 @@ package api import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" restclient "k8s.io/client-go/rest" ) diff --git a/src/jetstream/plugins/kubernetes/api_proxy.go b/src/jetstream/plugins/kubernetes/api_proxy.go index 3b788b73a1..3908eac633 100644 --- a/src/jetstream/plugins/kubernetes/api_proxy.go +++ b/src/jetstream/plugins/kubernetes/api_proxy.go @@ -7,7 +7,7 @@ import ( // Import the OIDC auth plugin _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // KubeProxyError represents error when a proxied request to the Kube API failes diff --git a/src/jetstream/plugins/kubernetes/auth/awsiam.go b/src/jetstream/plugins/kubernetes/auth/awsiam.go index 12fd369370..5dde8f94bd 100644 --- a/src/jetstream/plugins/kubernetes/auth/awsiam.go +++ b/src/jetstream/plugins/kubernetes/auth/awsiam.go @@ -8,7 +8,7 @@ import ( "time" // "github.com/SermoDigital/jose/jws" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/src/jetstream/plugins/kubernetes/auth/azure.go b/src/jetstream/plugins/kubernetes/auth/azure.go index 57722d2e42..5f666342cd 100644 --- a/src/jetstream/plugins/kubernetes/auth/azure.go +++ b/src/jetstream/plugins/kubernetes/auth/azure.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/config" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/config" "github.com/labstack/echo/v4" ) diff --git a/src/jetstream/plugins/kubernetes/auth/basic_auth.go b/src/jetstream/plugins/kubernetes/auth/basic_auth.go index f764aee55c..8b90c2db7a 100644 --- a/src/jetstream/plugins/kubernetes/auth/basic_auth.go +++ b/src/jetstream/plugins/kubernetes/auth/basic_auth.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/src/jetstream/plugins/kubernetes/auth/cert.go b/src/jetstream/plugins/kubernetes/auth/cert.go index 657182e9a1..df90ea1832 100644 --- a/src/jetstream/plugins/kubernetes/auth/cert.go +++ b/src/jetstream/plugins/kubernetes/auth/cert.go @@ -14,7 +14,7 @@ import ( "time" // "github.com/SermoDigital/jose/jws" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/src/jetstream/plugins/kubernetes/auth/gke.go b/src/jetstream/plugins/kubernetes/auth/gke.go index 690be1eab5..22307e4f24 100644 --- a/src/jetstream/plugins/kubernetes/auth/gke.go +++ b/src/jetstream/plugins/kubernetes/auth/gke.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/src/jetstream/plugins/kubernetes/auth/go.mod b/src/jetstream/plugins/kubernetes/auth/go.mod index 95c389671a..d884957ee9 100644 --- a/src/jetstream/plugins/kubernetes/auth/go.mod +++ b/src/jetstream/plugins/kubernetes/auth/go.mod @@ -1,10 +1,10 @@ -module github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth +module github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth go 1.21 replace ( - github.com/cloudfoundry-community/stratos/src/jetstream/api => ../../../api - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes => ../../kubernetes + github.com/cloudfoundry/stratos/src/jetstream/api => ../../../api + github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes => ../../kubernetes github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc k8s.io/client-go => k8s.io/client-go v0.23.17 ) @@ -12,8 +12,8 @@ replace ( require ( github.com/SermoDigital/jose v0.9.1 github.com/aws/aws-sdk-go v1.44.324 - github.com/cloudfoundry-community/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes v0.0.0-00010101000000-000000000000 github.com/labstack/echo/v4 v4.11.3 github.com/sirupsen/logrus v1.9.3 k8s.io/client-go v0.27.3 diff --git a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go index 27713f2566..cd593b5d78 100644 --- a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go +++ b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/config" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/config" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/src/jetstream/plugins/kubernetes/auth/oidc.go b/src/jetstream/plugins/kubernetes/auth/oidc.go index 8361bbd7ea..b38d36843f 100644 --- a/src/jetstream/plugins/kubernetes/auth/oidc.go +++ b/src/jetstream/plugins/kubernetes/auth/oidc.go @@ -8,8 +8,8 @@ import ( "net/http" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/config" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/config" "github.com/SermoDigital/jose/jws" "github.com/labstack/echo/v4" diff --git a/src/jetstream/plugins/kubernetes/auth/token.go b/src/jetstream/plugins/kubernetes/auth/token.go index fa4e3eb40f..942be73108 100644 --- a/src/jetstream/plugins/kubernetes/auth/token.go +++ b/src/jetstream/plugins/kubernetes/auth/token.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/src/jetstream/plugins/kubernetes/auth/types.go b/src/jetstream/plugins/kubernetes/auth/types.go index 1a3c52ed40..d9ba0f619c 100644 --- a/src/jetstream/plugins/kubernetes/auth/types.go +++ b/src/jetstream/plugins/kubernetes/auth/types.go @@ -5,7 +5,7 @@ import ( "encoding/json" "net/http" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "github.com/labstack/echo/v4" diff --git a/src/jetstream/plugins/kubernetes/auth_providers.go b/src/jetstream/plugins/kubernetes/auth_providers.go index 278432ab9d..d5a4a2a5e5 100644 --- a/src/jetstream/plugins/kubernetes/auth_providers.go +++ b/src/jetstream/plugins/kubernetes/auth_providers.go @@ -3,7 +3,7 @@ package kubernetes import ( "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth" ) var kubeAuthProviders map[string]auth.KubeAuthProvider diff --git a/src/jetstream/plugins/kubernetes/config/kube_config.go b/src/jetstream/plugins/kubernetes/config/kube_config.go index 350e41a1e2..743c7e9807 100644 --- a/src/jetstream/plugins/kubernetes/config/kube_config.go +++ b/src/jetstream/plugins/kubernetes/config/kube_config.go @@ -6,7 +6,7 @@ import ( "net/url" "reflect" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" "gopkg.in/yaml.v2" ) diff --git a/src/jetstream/plugins/kubernetes/dashboard/common.go b/src/jetstream/plugins/kubernetes/dashboard/common.go index 5643f6586b..4a9978f9af 100644 --- a/src/jetstream/plugins/kubernetes/dashboard/common.go +++ b/src/jetstream/plugins/kubernetes/dashboard/common.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/kubernetes/dashboard/configure.go b/src/jetstream/plugins/kubernetes/dashboard/configure.go index 89550d44d3..d1c4c5adcd 100644 --- a/src/jetstream/plugins/kubernetes/dashboard/configure.go +++ b/src/jetstream/plugins/kubernetes/dashboard/configure.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" ) diff --git a/src/jetstream/plugins/kubernetes/dashboard/login.go b/src/jetstream/plugins/kubernetes/dashboard/login.go index 5dbe7bc0ef..53ac8d65d5 100644 --- a/src/jetstream/plugins/kubernetes/dashboard/login.go +++ b/src/jetstream/plugins/kubernetes/dashboard/login.go @@ -9,7 +9,7 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) type loginResponse struct { diff --git a/src/jetstream/plugins/kubernetes/dashboard/proxy.go b/src/jetstream/plugins/kubernetes/dashboard/proxy.go index 76d28e5182..7bc004fb68 100644 --- a/src/jetstream/plugins/kubernetes/dashboard/proxy.go +++ b/src/jetstream/plugins/kubernetes/dashboard/proxy.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" utilnet "k8s.io/apimachinery/pkg/util/net" diff --git a/src/jetstream/plugins/kubernetes/dashboard/status.go b/src/jetstream/plugins/kubernetes/dashboard/status.go index 2827167455..f46561c982 100644 --- a/src/jetstream/plugins/kubernetes/dashboard/status.go +++ b/src/jetstream/plugins/kubernetes/dashboard/status.go @@ -1,7 +1,7 @@ package dashboard import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) const stratosServiceAccountSelector = "stratos-role%3Dkubernetes-dashboard-user" diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go index 81bf99a260..f2c6b4bfa9 100644 --- a/src/jetstream/plugins/kubernetes/endpoint_config.go +++ b/src/jetstream/plugins/kubernetes/endpoint_config.go @@ -10,7 +10,7 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // GetConfigForEndpoint gets a config for the Kubernetes go-client for the specified endpoint diff --git a/src/jetstream/plugins/kubernetes/get_release.go b/src/jetstream/plugins/kubernetes/get_release.go index 14e2797ae8..9ce645183c 100644 --- a/src/jetstream/plugins/kubernetes/get_release.go +++ b/src/jetstream/plugins/kubernetes/get_release.go @@ -12,8 +12,8 @@ import ( "helm.sh/helm/v3/pkg/action" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/helm" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/helm" ) const ( diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod index e853871f63..9016909401 100644 --- a/src/jetstream/plugins/kubernetes/go.mod +++ b/src/jetstream/plugins/kubernetes/go.mod @@ -1,12 +1,12 @@ -module github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes +module github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes go 1.21 toolchain go1.21.5 require ( - github.com/cloudfoundry-community/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth v0.0.0-00010101000000-000000000000 github.com/gorilla/websocket v1.5.0 github.com/labstack/echo/v4 v4.11.3 github.com/satori/go.uuid v1.2.0 @@ -172,9 +172,9 @@ require ( replace ( github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc - github.com/cloudfoundry-community/stratos/src/jetstream => ../../../jetstream - github.com/cloudfoundry-community/stratos/src/jetstream/api => ../../../jetstream/api - github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth => ./auth + github.com/cloudfoundry/stratos/src/jetstream => ../../../jetstream + github.com/cloudfoundry/stratos/src/jetstream/api => ../../../jetstream/api + github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth => ./auth github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2 diff --git a/src/jetstream/plugins/kubernetes/helm/job.go b/src/jetstream/plugins/kubernetes/helm/job.go index 700b3c7a3f..6d7f7a1a35 100644 --- a/src/jetstream/plugins/kubernetes/helm/job.go +++ b/src/jetstream/plugins/kubernetes/helm/job.go @@ -3,7 +3,7 @@ package helm import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // KubeResourceJob = Resource(s) that we need to go and fetch diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go index 7281498beb..b1461de2e7 100644 --- a/src/jetstream/plugins/kubernetes/helm/release.go +++ b/src/jetstream/plugins/kubernetes/helm/release.go @@ -9,7 +9,7 @@ import ( "reflect" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" "helm.sh/helm/v3/pkg/release" appsv1 "k8s.io/api/apps/v1" diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go index e3a554a353..703619c3c8 100644 --- a/src/jetstream/plugins/kubernetes/install_release.go +++ b/src/jetstream/plugins/kubernetes/install_release.go @@ -17,7 +17,7 @@ import ( "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) const chartCollection = "charts" diff --git a/src/jetstream/plugins/kubernetes/kube_dashboard.go b/src/jetstream/plugins/kubernetes/kube_dashboard.go index 146033c4fa..814318431b 100644 --- a/src/jetstream/plugins/kubernetes/kube_dashboard.go +++ b/src/jetstream/plugins/kubernetes/kube_dashboard.go @@ -9,8 +9,8 @@ import ( log "github.com/sirupsen/logrus" "k8s.io/client-go/rest" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/dashboard" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/dashboard" ) // Get the config for the endpoint diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go index 77438b2b47..3dd2e9d53d 100644 --- a/src/jetstream/plugins/kubernetes/list_releases.go +++ b/src/jetstream/plugins/kubernetes/list_releases.go @@ -6,7 +6,7 @@ import ( "helm.sh/helm/v3/pkg/action" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // ListReleases will list the helm releases for all endpoints diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go index 4803319077..a9e9127eaf 100644 --- a/src/jetstream/plugins/kubernetes/main.go +++ b/src/jetstream/plugins/kubernetes/main.go @@ -11,13 +11,13 @@ import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/terminal" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/terminal" ) // KubernetesSpecification is the endpoint that adds Kubernetes support to the backend diff --git a/src/jetstream/plugins/kubernetes/terminal/helpers.go b/src/jetstream/plugins/kubernetes/terminal/helpers.go index 664c9bf6d8..955c1915a7 100644 --- a/src/jetstream/plugins/kubernetes/terminal/helpers.go +++ b/src/jetstream/plugins/kubernetes/terminal/helpers.go @@ -13,8 +13,8 @@ import ( uuid "github.com/satori/go.uuid" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth" "github.com/gorilla/websocket" v1 "k8s.io/api/core/v1" diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go index 2064828eda..aa50e902c8 100644 --- a/src/jetstream/plugins/kubernetes/terminal/start.go +++ b/src/jetstream/plugins/kubernetes/terminal/start.go @@ -14,7 +14,7 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/gorilla/websocket" ) diff --git a/src/jetstream/plugins/kubernetes/terminal/terminal.go b/src/jetstream/plugins/kubernetes/terminal/terminal.go index 1bd00835d7..74b91ad36a 100644 --- a/src/jetstream/plugins/kubernetes/terminal/terminal.go +++ b/src/jetstream/plugins/kubernetes/terminal/terminal.go @@ -4,9 +4,9 @@ import ( "fmt" "io/ioutil" - jetstream_api "github.com/cloudfoundry-community/stratos/src/jetstream/api" - jetstream_config "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/api" + jetstream_api "github.com/cloudfoundry/stratos/src/jetstream/api" + jetstream_config "github.com/cloudfoundry/stratos/src/jetstream/api/config" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/metrics/cloud_foundry.go b/src/jetstream/plugins/metrics/cloud_foundry.go index 68afe4a1bb..497feeaaf3 100644 --- a/src/jetstream/plugins/metrics/cloud_foundry.go +++ b/src/jetstream/plugins/metrics/cloud_foundry.go @@ -9,7 +9,7 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) var ( diff --git a/src/jetstream/plugins/metrics/main.go b/src/jetstream/plugins/metrics/main.go index 01fc6b3f33..8b4806e56e 100644 --- a/src/jetstream/plugins/metrics/main.go +++ b/src/jetstream/plugins/metrics/main.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/tokens" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/repository/tokens" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/monocular/artifacthub.go b/src/jetstream/plugins/monocular/artifacthub.go index fa49e81093..1ba494fe92 100644 --- a/src/jetstream/plugins/monocular/artifacthub.go +++ b/src/jetstream/plugins/monocular/artifacthub.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular/store" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular/store" "github.com/labstack/echo/v4" yaml "gopkg.in/yaml.v2" ) diff --git a/src/jetstream/plugins/monocular/cache.go b/src/jetstream/plugins/monocular/cache.go index 8df58eace9..3b69f74110 100644 --- a/src/jetstream/plugins/monocular/cache.go +++ b/src/jetstream/plugins/monocular/cache.go @@ -16,7 +16,7 @@ import ( "path/filepath" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular/store" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular/store" log "github.com/sirupsen/logrus" yaml "gopkg.in/yaml.v2" ) diff --git a/src/jetstream/plugins/monocular/chart_svc.go b/src/jetstream/plugins/monocular/chart_svc.go index 5d4d127c2f..cabaec3f2a 100644 --- a/src/jetstream/plugins/monocular/chart_svc.go +++ b/src/jetstream/plugins/monocular/chart_svc.go @@ -7,7 +7,7 @@ import ( "os" "path" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular/store" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular/store" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/monocular/endpoint.go b/src/jetstream/plugins/monocular/endpoint.go index d959665893..e6797a0bcc 100644 --- a/src/jetstream/plugins/monocular/endpoint.go +++ b/src/jetstream/plugins/monocular/endpoint.go @@ -5,7 +5,7 @@ import ( "fmt" "net/url" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/monocular/go.mod b/src/jetstream/plugins/monocular/go.mod index 934f5656a2..aa7f09b676 100644 --- a/src/jetstream/plugins/monocular/go.mod +++ b/src/jetstream/plugins/monocular/go.mod @@ -1,4 +1,4 @@ -module github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular +module github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular go 1.21 @@ -6,8 +6,8 @@ toolchain go1.21.5 require ( github.com/Masterminds/semver/v3 v3.2.1 - github.com/cloudfoundry-community/stratos/src/jetstream v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-community/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 github.com/labstack/echo/v4 v4.11.3 github.com/pressly/goose v2.7.0+incompatible github.com/satori/go.uuid v1.2.0 @@ -43,12 +43,12 @@ require ( gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect ) -replace github.com/cloudfoundry-community/stratos/src/jetstream => ../../ +replace github.com/cloudfoundry/stratos/src/jetstream => ../../ -replace github.com/cloudfoundry-community/stratos/src/jetstream/api => ../../api +replace github.com/cloudfoundry/stratos/src/jetstream/api => ../../api -replace github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfapppush => ../cfapppush +replace github.com/cloudfoundry/stratos/src/jetstream/plugins/cfapppush => ../cfapppush -replace github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes => ../kubernetes +replace github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes => ../kubernetes -replace github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth => ../kubernetes/auth +replace github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes/auth => ../kubernetes/auth diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go index 900f10e89f..d56fe367d8 100644 --- a/src/jetstream/plugins/monocular/main.go +++ b/src/jetstream/plugins/monocular/main.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular/store" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular/store" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/monocular/repository.go b/src/jetstream/plugins/monocular/repository.go index 26ca5b0f6e..b3f6bd7fd9 100644 --- a/src/jetstream/plugins/monocular/repository.go +++ b/src/jetstream/plugins/monocular/repository.go @@ -4,7 +4,7 @@ import ( "encoding/json" "io/ioutil" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/monocular/store/chart_store_db.go b/src/jetstream/plugins/monocular/store/chart_store_db.go index b89ddad654..8b2d5b63f5 100644 --- a/src/jetstream/plugins/monocular/store/chart_store_db.go +++ b/src/jetstream/plugins/monocular/store/chart_store_db.go @@ -6,7 +6,7 @@ import ( "fmt" "sort" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go index 0bc89885e3..2a3118c2d7 100644 --- a/src/jetstream/plugins/monocular/sync.go +++ b/src/jetstream/plugins/monocular/sync.go @@ -3,7 +3,7 @@ package monocular import ( "encoding/json" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/monocular/sync_worker.go b/src/jetstream/plugins/monocular/sync_worker.go index bc1195ab59..7cbdfee010 100644 --- a/src/jetstream/plugins/monocular/sync_worker.go +++ b/src/jetstream/plugins/monocular/sync_worker.go @@ -7,7 +7,7 @@ import ( yaml "gopkg.in/yaml.v2" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular/store" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular/store" uuid "github.com/satori/go.uuid" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/userfavorites/favorites.go b/src/jetstream/plugins/userfavorites/favorites.go index a824593f05..0d2980a383 100644 --- a/src/jetstream/plugins/userfavorites/favorites.go +++ b/src/jetstream/plugins/userfavorites/favorites.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" "github.com/labstack/echo/v4" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) func (uf *UserFavorites) getAll(c echo.Context) error { diff --git a/src/jetstream/plugins/userfavorites/main.go b/src/jetstream/plugins/userfavorites/main.go index 37fea8549d..cbf3b39237 100644 --- a/src/jetstream/plugins/userfavorites/main.go +++ b/src/jetstream/plugins/userfavorites/main.go @@ -3,8 +3,8 @@ package userfavorites import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" "github.com/labstack/echo/v4" ) diff --git a/src/jetstream/plugins/userfavorites/userfavoritesendpoints/main.go b/src/jetstream/plugins/userfavorites/userfavoritesendpoints/main.go index 25c51ce0bf..46fa7c40be 100644 --- a/src/jetstream/plugins/userfavorites/userfavoritesendpoints/main.go +++ b/src/jetstream/plugins/userfavorites/userfavoritesendpoints/main.go @@ -1,8 +1,8 @@ package userfavoritesendpoints import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" ) type userFavoriteEndpoints struct { diff --git a/src/jetstream/plugins/userfavorites/userfavoritesstore/favorites-store-db.go b/src/jetstream/plugins/userfavorites/userfavoritesstore/favorites-store-db.go index e5deb0dd35..2523d40369 100644 --- a/src/jetstream/plugins/userfavorites/userfavoritesstore/favorites-store-db.go +++ b/src/jetstream/plugins/userfavorites/userfavoritesstore/favorites-store-db.go @@ -7,7 +7,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" ) var ( diff --git a/src/jetstream/plugins/userinfo/local_user.go b/src/jetstream/plugins/userinfo/local_user.go index 64571058e5..97db5ad502 100644 --- a/src/jetstream/plugins/userinfo/local_user.go +++ b/src/jetstream/plugins/userinfo/local_user.go @@ -6,8 +6,8 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/localusers" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/repository/localusers" ) // LocalUserInfo is a plugin to fetch user info diff --git a/src/jetstream/plugins/userinfo/main.go b/src/jetstream/plugins/userinfo/main.go index 35401d65af..8e7f0b1b00 100644 --- a/src/jetstream/plugins/userinfo/main.go +++ b/src/jetstream/plugins/userinfo/main.go @@ -8,7 +8,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" ) diff --git a/src/jetstream/plugins/userinfo/noauth_user.go b/src/jetstream/plugins/userinfo/noauth_user.go index 22cb682070..14a76edf5b 100644 --- a/src/jetstream/plugins/userinfo/noauth_user.go +++ b/src/jetstream/plugins/userinfo/noauth_user.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // NoAuthUserInfo is a plugin for no authentication diff --git a/src/jetstream/plugins/userinfo/uaa_user.go b/src/jetstream/plugins/userinfo/uaa_user.go index 96ddddb171..6c7c02c2cb 100644 --- a/src/jetstream/plugins/userinfo/uaa_user.go +++ b/src/jetstream/plugins/userinfo/uaa_user.go @@ -10,7 +10,7 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // UaaUserInfo for UAA User Info diff --git a/src/jetstream/plugins/userinvite/admin.go b/src/jetstream/plugins/userinvite/admin.go index d46ac7238e..50f6b73316 100644 --- a/src/jetstream/plugins/userinvite/admin.go +++ b/src/jetstream/plugins/userinvite/admin.go @@ -9,7 +9,7 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) type StatusResponse struct { diff --git a/src/jetstream/plugins/userinvite/auth.go b/src/jetstream/plugins/userinvite/auth.go index f27f1405de..e072057487 100644 --- a/src/jetstream/plugins/userinvite/auth.go +++ b/src/jetstream/plugins/userinvite/auth.go @@ -14,7 +14,7 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // RefreshToken will refresh the token for the client diff --git a/src/jetstream/plugins/userinvite/config.go b/src/jetstream/plugins/userinvite/config.go index 5783a5e7d9..10d635da2a 100644 --- a/src/jetstream/plugins/userinvite/config.go +++ b/src/jetstream/plugins/userinvite/config.go @@ -7,7 +7,7 @@ import ( "path" text "text/template" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" "github.com/govau/cf-common/env" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/userinvite/email.go b/src/jetstream/plugins/userinvite/email.go index 9e9bbcc668..914b091b05 100644 --- a/src/jetstream/plugins/userinvite/email.go +++ b/src/jetstream/plugins/userinvite/email.go @@ -7,7 +7,7 @@ import ( "net/smtp" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/domodwyer/mailyak" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/userinvite/endpoint.go b/src/jetstream/plugins/userinvite/endpoint.go index 331e30f8b3..5765b3919c 100644 --- a/src/jetstream/plugins/userinvite/endpoint.go +++ b/src/jetstream/plugins/userinvite/endpoint.go @@ -3,7 +3,7 @@ package userinvite import ( "errors" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" diff --git a/src/jetstream/plugins/userinvite/invite.go b/src/jetstream/plugins/userinvite/invite.go index 9e868252d7..d5c397210a 100644 --- a/src/jetstream/plugins/userinvite/invite.go +++ b/src/jetstream/plugins/userinvite/invite.go @@ -14,7 +14,7 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // CFError is the error info returned from the CF API diff --git a/src/jetstream/plugins/userinvite/main.go b/src/jetstream/plugins/userinvite/main.go index 396c961832..eeb8287f04 100644 --- a/src/jetstream/plugins/userinvite/main.go +++ b/src/jetstream/plugins/userinvite/main.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/yamlgenerated/main.go b/src/jetstream/plugins/yamlgenerated/main.go index c70bbe018d..0792c770cc 100644 --- a/src/jetstream/plugins/yamlgenerated/main.go +++ b/src/jetstream/plugins/yamlgenerated/main.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/labstack/echo/v4" "gopkg.in/yaml.v2" diff --git a/src/jetstream/portal_config.go b/src/jetstream/portal_config.go index 3f721e3352..c2d4232f0d 100644 --- a/src/jetstream/portal_config.go +++ b/src/jetstream/portal_config.go @@ -1,7 +1,7 @@ package main import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/govau/cf-common/env" ) diff --git a/src/jetstream/portal_proxy.go b/src/jetstream/portal_proxy.go index 8ef7a3f823..65384486d8 100644 --- a/src/jetstream/portal_proxy.go +++ b/src/jetstream/portal_proxy.go @@ -5,8 +5,8 @@ import ( "regexp" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/apikeys" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/repository/apikeys" "github.com/gorilla/sessions" "github.com/govau/cf-common/env" "github.com/labstack/echo/v4" diff --git a/src/jetstream/repository/apikeys/apikeys.go b/src/jetstream/repository/apikeys/apikeys.go index 4a100f402e..657fc076ac 100644 --- a/src/jetstream/repository/apikeys/apikeys.go +++ b/src/jetstream/repository/apikeys/apikeys.go @@ -1,6 +1,6 @@ package apikeys -import "github.com/cloudfoundry-community/stratos/src/jetstream/api" +import "github.com/cloudfoundry/stratos/src/jetstream/api" // Repository - API keys repository type Repository interface { diff --git a/src/jetstream/repository/apikeys/mock/mock_apikeys.go b/src/jetstream/repository/apikeys/mock/mock_apikeys.go index a53e8896db..8884ffd847 100644 --- a/src/jetstream/repository/apikeys/mock/mock_apikeys.go +++ b/src/jetstream/repository/apikeys/mock/mock_apikeys.go @@ -7,7 +7,7 @@ package mock_apikeys import ( reflect "reflect" - api "github.com/cloudfoundry-community/stratos/src/jetstream/api" + api "github.com/cloudfoundry/stratos/src/jetstream/api" gomock "github.com/golang/mock/gomock" ) diff --git a/src/jetstream/repository/apikeys/psql_apikeys.go b/src/jetstream/repository/apikeys/psql_apikeys.go index 94bdbce7b6..ae01fd7739 100644 --- a/src/jetstream/repository/apikeys/psql_apikeys.go +++ b/src/jetstream/repository/apikeys/psql_apikeys.go @@ -8,9 +8,9 @@ import ( "reflect" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" uuid "github.com/satori/go.uuid" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/repository/apikeys/psql_apikeys_test.go b/src/jetstream/repository/apikeys/psql_apikeys_test.go index b61012992a..e574d599c5 100644 --- a/src/jetstream/repository/apikeys/psql_apikeys_test.go +++ b/src/jetstream/repository/apikeys/psql_apikeys_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" . "github.com/smartystreets/goconvey/convey" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/src/jetstream/repository/cnsis/pgsql_cnsis.go b/src/jetstream/repository/cnsis/pgsql_cnsis.go index e289eba50e..42c30cdd27 100644 --- a/src/jetstream/repository/cnsis/pgsql_cnsis.go +++ b/src/jetstream/repository/cnsis/pgsql_cnsis.go @@ -6,9 +6,9 @@ import ( "fmt" "net/url" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/repository/cnsis/pgsql_cnsis_test.go b/src/jetstream/repository/cnsis/pgsql_cnsis_test.go index dddf2f3cef..c38b32edbc 100644 --- a/src/jetstream/repository/cnsis/pgsql_cnsis_test.go +++ b/src/jetstream/repository/cnsis/pgsql_cnsis_test.go @@ -7,8 +7,8 @@ import ( "gopkg.in/DATA-DOG/go-sqlmock.v1" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/testutils" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/testutils" . "github.com/smartystreets/goconvey/convey" ) diff --git a/src/jetstream/repository/console_config/console_config.go b/src/jetstream/repository/console_config/console_config.go index ac7a151982..ccc0de1567 100644 --- a/src/jetstream/repository/console_config/console_config.go +++ b/src/jetstream/repository/console_config/console_config.go @@ -1,7 +1,7 @@ package console_config import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) type Repository interface { diff --git a/src/jetstream/repository/console_config/env_lookup.go b/src/jetstream/repository/console_config/env_lookup.go index 9e892cfc28..0dce1e6da7 100644 --- a/src/jetstream/repository/console_config/env_lookup.go +++ b/src/jetstream/repository/console_config/env_lookup.go @@ -6,7 +6,7 @@ import ( "github.com/govau/cf-common/env" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) const ( diff --git a/src/jetstream/repository/console_config/psql_console_config.go b/src/jetstream/repository/console_config/psql_console_config.go index e58d24acae..0a7d822e1f 100644 --- a/src/jetstream/repository/console_config/psql_console_config.go +++ b/src/jetstream/repository/console_config/psql_console_config.go @@ -8,8 +8,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" ) // Legacy diff --git a/src/jetstream/repository/goose-db-version/goose-db-version.go b/src/jetstream/repository/goose-db-version/goose-db-version.go index 343231627d..c21379f8ec 100644 --- a/src/jetstream/repository/goose-db-version/goose-db-version.go +++ b/src/jetstream/repository/goose-db-version/goose-db-version.go @@ -1,7 +1,7 @@ package goosedbversion import ( - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // Repository - the repository required to talk to this table of data diff --git a/src/jetstream/repository/goose-db-version/pgsql_goose_db_version.go b/src/jetstream/repository/goose-db-version/pgsql_goose_db_version.go index 4e35f08b37..240a7a2f0d 100644 --- a/src/jetstream/repository/goose-db-version/pgsql_goose_db_version.go +++ b/src/jetstream/repository/goose-db-version/pgsql_goose_db_version.go @@ -8,8 +8,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/custom_errors" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/custom_errors" ) const ( diff --git a/src/jetstream/repository/goose-db-version/pgsql_goose_db_version_test.go b/src/jetstream/repository/goose-db-version/pgsql_goose_db_version_test.go index 1aa5058e5c..9e4c8ee2bc 100644 --- a/src/jetstream/repository/goose-db-version/pgsql_goose_db_version_test.go +++ b/src/jetstream/repository/goose-db-version/pgsql_goose_db_version_test.go @@ -8,8 +8,8 @@ import ( . "github.com/smartystreets/goconvey/convey" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/custom_errors" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/custom_errors" ) func TestPgSQLGooseDB(t *testing.T) { diff --git a/src/jetstream/repository/localusers/localusers.go b/src/jetstream/repository/localusers/localusers.go index 0d11ffb608..a05cdb7310 100644 --- a/src/jetstream/repository/localusers/localusers.go +++ b/src/jetstream/repository/localusers/localusers.go @@ -3,7 +3,7 @@ package localusers import ( "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" ) // Repository is an application of the repository pattern for storing local users diff --git a/src/jetstream/repository/localusers/psql_localusers.go b/src/jetstream/repository/localusers/psql_localusers.go index 1381143ec6..647d696055 100644 --- a/src/jetstream/repository/localusers/psql_localusers.go +++ b/src/jetstream/repository/localusers/psql_localusers.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/repository/sessiondata/psql_sessiondata.go b/src/jetstream/repository/sessiondata/psql_sessiondata.go index fadd1ae635..6b383967d8 100644 --- a/src/jetstream/repository/sessiondata/psql_sessiondata.go +++ b/src/jetstream/repository/sessiondata/psql_sessiondata.go @@ -8,8 +8,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" ) var getSessionDataValues = `SELECT name, value FROM session_data WHERE expired=false AND session=$1 AND groupName = $1` diff --git a/src/jetstream/repository/tokens/pgsql_tokens.go b/src/jetstream/repository/tokens/pgsql_tokens.go index 92e4bb272d..d0b31907f3 100644 --- a/src/jetstream/repository/tokens/pgsql_tokens.go +++ b/src/jetstream/repository/tokens/pgsql_tokens.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" uuid "github.com/satori/go.uuid" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/repository/tokens/pgsql_tokens_test.go b/src/jetstream/repository/tokens/pgsql_tokens_test.go index ace6a38349..0975734ebe 100644 --- a/src/jetstream/repository/tokens/pgsql_tokens_test.go +++ b/src/jetstream/repository/tokens/pgsql_tokens_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" . "github.com/smartystreets/goconvey/convey" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/src/jetstream/session.go b/src/jetstream/session.go index 0de501ff70..1af184e295 100644 --- a/src/jetstream/session.go +++ b/src/jetstream/session.go @@ -12,8 +12,8 @@ import ( "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" ) const ( diff --git a/src/jetstream/session_test.go b/src/jetstream/session_test.go index 2a743297e6..7be6e7baf2 100644 --- a/src/jetstream/session_test.go +++ b/src/jetstream/session_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api" "github.com/gorilla/sessions" "github.com/labstack/echo/v4" . "github.com/smartystreets/goconvey/convey" diff --git a/src/jetstream/setup_console.go b/src/jetstream/setup_console.go index 545e1615d9..ed1e94eda2 100644 --- a/src/jetstream/setup_console.go +++ b/src/jetstream/setup_console.go @@ -14,11 +14,11 @@ import ( uuid "github.com/satori/go.uuid" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/console_config" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/localusers" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/api/config" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/repository/console_config" + "github.com/cloudfoundry/stratos/src/jetstream/repository/localusers" ) const ( diff --git a/src/jetstream/setup_console_test.go b/src/jetstream/setup_console_test.go index d78922e1bd..1216cc81aa 100644 --- a/src/jetstream/setup_console_test.go +++ b/src/jetstream/setup_console_test.go @@ -3,8 +3,8 @@ package main import ( "testing" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/console_config" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/repository/console_config" "github.com/govau/cf-common/env" . "github.com/smartystreets/goconvey/convey" diff --git a/src/jetstream/testutils/testhelpers.go b/src/jetstream/testutils/testhelpers.go index ad50003c56..cacc45fbd5 100644 --- a/src/jetstream/testutils/testhelpers.go +++ b/src/jetstream/testutils/testhelpers.go @@ -4,10 +4,10 @@ import ( "net/url" "time" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-community/stratos/src/jetstream/repository/tokens" + "github.com/cloudfoundry/stratos/src/jetstream/api" + "github.com/cloudfoundry/stratos/src/jetstream/crypto" + "github.com/cloudfoundry/stratos/src/jetstream/datastore" + "github.com/cloudfoundry/stratos/src/jetstream/repository/tokens" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/src/jetstream/version_info.go b/src/jetstream/version_info.go index ad54d91517..4f1a582c85 100644 --- a/src/jetstream/version_info.go +++ b/src/jetstream/version_info.go @@ -4,8 +4,8 @@ import ( "errors" "net/http" - "github.com/cloudfoundry-community/stratos/src/jetstream/api" - goosedbversion "github.com/cloudfoundry-community/stratos/src/jetstream/repository/goose-db-version" + "github.com/cloudfoundry/stratos/src/jetstream/api" + goosedbversion "github.com/cloudfoundry/stratos/src/jetstream/repository/goose-db-version" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" )