diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml index 0212ece21b..ab1507ad4f 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-incubator/stratos/src/jetstream/plugins/autoscaler" - import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundry" - import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfapppush" - import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfappssh" - import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userinvite" - import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/analysis" - import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes" - import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular"' > src/jetstream/extra_plugins.go + 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 - name: Run tests run: build/bk-build.sh test diff --git a/angular.json b/angular.json index efafa31e2f..2064f553f6 100644 --- a/angular.json +++ b/angular.json @@ -403,5 +403,8 @@ "@schematics/angular:directive": { "prefix": "app" } + }, + "cli": { + "analytics": false } } diff --git a/bin/package b/bin/package index 6947df69dd..dbdd9c4c74 100755 --- a/bin/package +++ b/bin/package @@ -11,17 +11,26 @@ node::install() { mkdir -p "${node_install_dir}" - if [[ ! -f "${node_install_dir}/go/bin/go" ]]; then - NODE_MD5="5bda713bd4aa39394536fc48c744854b" - URL=https://buildpacks.cloudfoundry.org/dependencies/node/node-${NODE_VERSION}-linux-x64-40e8e080.tgz + if [[ ! -f "${node_install_dir}/bin/node" ]]; then +# - name: node +# version: 20.13.1 +# uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.13.1_linux_x64_cflinuxfs4_71ec5c92.tgz +# sha256: 71ec5c92b35770170dad21ff65130f3e4201e8a0bcd32986e5dcf32b57f379e6 +# cf_stacks: +# - cflinuxfs4 +# source: https://nodejs.org/dist/v20.13.1/node-v20.13.1.tar.gz +# source_sha256: a85ee53aa0a5c2f5ca94fa414cdbceb91eb7d18a77fc498358512c14cc6c6991 + + NODE_SHA2="71ec5c92b35770170dad21ff65130f3e4201e8a0bcd32986e5dcf32b57f379e6" + URL=https://buildpacks.cloudfoundry.org/dependencies/node/node_${NODE_VERSION}_linux_x64_cflinuxfs4_71ec5c92.tgz echo "-----> Download Nodejs ${NODE_VERSION}" curl -s -L --retry 15 --retry-delay 2 $URL -o ${download_file} - DOWNLOAD_MD5=$(md5sum ${download_file} | cut -d ' ' -f 1) + DOWNLOAD_SHA2=$(sha256sum ${download_file} | cut -d ' ' -f 1) - if [[ ${DOWNLOAD_MD5} != ${NODE_MD5} ]]; then - echo " **ERROR** MD5 mismatch: got $DOWNLOAD_MD5 expected $NODE_MD5" + if [[ ${DOWNLOAD_SHA2} != ${NODE_SHA2} ]]; then + echo " **ERROR** MD5 mismatch: got $DOWNLOAD_SHA2 expected $NODE_SHA2" exit 1 fi @@ -41,9 +50,9 @@ declare git_url git_tag work_dir declare -x TAG NODE_VERSION TMP_DIR git_url="https://github.com/cloudfoundry-community/stratos.git" -git_tag="${TAG:-master}}" +git_tag="${TAG:-master}" work_dir="${PWD}" -NODE_VERSION="${NODE_VERISON:-8.11.2}" +NODE_VERSION="${NODE_VERISON:-20.13.1}" TMP_DIR=/tmp git clone "${git_url}" stratos-ui || true @@ -57,7 +66,7 @@ fi function exit_trap() { # See: install_nodejs.sh - NODE_VERSION="8.11.2" + NODE_VERSION="20.13.1" rm -rf "/tmp/node${NODE_VERSION}.tar.gz" "/tmp/node${NODE_VERSION}" } trap exit_trap EXIT @@ -99,7 +108,7 @@ echo "web: ./deploy/cloud-foundry/start.sh" > "${build_dir}/Procfile" ls -lah "${build_dir}" cd "${build_dir}" -zip -r "${work_dir}}/stratos-ui-packaged.zip" ./* +zip -r "${work_dir}/stratos-ui-packaged.zip" ./* cd "${work_dir}" exit 0 diff --git a/build/bk-build.sh b/build/bk-build.sh index cc6aa6f80e..d396de6a3c 100755 --- a/build/bk-build.sh +++ b/build/bk-build.sh @@ -39,6 +39,9 @@ swag init --parseDependency if [ "${ACTION}" == "build" ]; then echo "Building backend ..." + echo "Disk Space ${PWD}" + df -hT + echo "Building version: ${VERSION}" go build -ldflags -X=main.appVersion=${VERSION} echo "Build complete ..." diff --git a/deploy/cloud-foundry/build.sh b/deploy/cloud-foundry/build.sh index 9324f39f38..f346b11681 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-incubator/stratos/vendor +VENDOR_FOLDER=tmp/go/src/github.com/cloudfoundry-community/stratos/vendor function log { COLOR=${2:-} @@ -63,6 +63,8 @@ fi log "Building back-end" $CYAN ./build/bk-build.sh +log "Copying executable" $CYAN + # Copy backend executable here cp src/jetstream/jetstream . diff --git a/manifest.yml b/manifest.yml index d7c3073548..2f444803d9 100644 --- a/manifest.yml +++ b/manifest.yml @@ -4,7 +4,7 @@ applications: disk_quota: 1024M host: console timeout: 180 - buildpack: https://github.com/cloudfoundry-incubator/stratos-buildpack#v4.0 + buildpack: https://github.com/cloudfoundry-community/stratos-buildpack#v5 health-check-type: port # env: # Override CF API endpoint URL inferred from VCAP_APPLICATION env diff --git a/src/frontend/packages/devkit/src/backend.ts b/src/frontend/packages/devkit/src/backend.ts index fa981091c3..685c5c8f65 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-incubator/stratos/src/jetstream/plugins/${pkg}"\n`); + fs.appendFileSync(backendPluginsFile, `import _ "github.com/cloudfoundry-community/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 d83554c3b5..dad0dec46e 100644 --- a/src/jetstream/api/go.mod +++ b/src/jetstream/api/go.mod @@ -1,6 +1,6 @@ -module github.com/cloudfoundry-incubator/stratos/src/jetstream/api +module github.com/cloudfoundry-community/stratos/src/jetstream/api -go 1.21.0 +go 1.21 require ( github.com/golang/mock v1.6.0 diff --git a/src/jetstream/api/mock/mock_auth.go b/src/jetstream/api/mock/mock_auth.go index ed587b287c..894d9f7806 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-incubator/stratos/src/jetstream/api" + api "github.com/cloudfoundry-community/stratos/src/jetstream/api" gomock "github.com/golang/mock/gomock" echo "github.com/labstack/echo/v4" ) diff --git a/src/jetstream/api/sessiondata.go b/src/jetstream/api/sessiondata.go index e2282aeeb6..458694824d 100644 --- a/src/jetstream/api/sessiondata.go +++ b/src/jetstream/api/sessiondata.go @@ -14,9 +14,7 @@ type SessionDataStore interface { // Cleanup runs a background goroutine every interval that deletes expired sessions from the database Cleanup(interval time.Duration) (chan<- struct{}, <-chan struct{}) - + // StopCleanup stops the background cleanup from running StopCleanup(quit chan<- struct{}, done <-chan struct{}) - - } diff --git a/src/jetstream/api/structs.go b/src/jetstream/api/structs.go index 9b753508ee..c4a9119fb5 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-incubator/stratos/src/jetstream/api/config" + api "github.com/cloudfoundry-community/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 2b50da635c..381f697d83 100644 --- a/src/jetstream/apikeys.go +++ b/src/jetstream/apikeys.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" + "github.com/cloudfoundry-community/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 5fa46414f2..19a88f91a7 100644 --- a/src/jetstream/apikeys_test.go +++ b/src/jetstream/apikeys_test.go @@ -6,10 +6,10 @@ import ( "net/http" "testing" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" - mock_api "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/mock" - mock_apikeys "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/apikeys/mock" + "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/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 36b715628f..2a34d222b5 100644 --- a/src/jetstream/auth.go +++ b/src/jetstream/auth.go @@ -9,7 +9,7 @@ import ( "github.com/labstack/echo/v4" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 427e71b2e4..26c02cbf04 100644 --- a/src/jetstream/auth_providers.go +++ b/src/jetstream/auth_providers.go @@ -1,6 +1,6 @@ package main -import "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" +import "github.com/cloudfoundry-community/stratos/src/jetstream/api" // log "github.com/sirupsen/logrus" diff --git a/src/jetstream/auth_test.go b/src/jetstream/auth_test.go index 1ac5ab861a..84c78f891a 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" - mock_api "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/mock" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/testutils" + "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/smartystreets/goconvey/convey" ) diff --git a/src/jetstream/authcnsi.go b/src/jetstream/authcnsi.go index 3507756794..10cc07326a 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens" + "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" ) // 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 59b1524f0f..50a89ba6c1 100644 --- a/src/jetstream/authlocal.go +++ b/src/jetstream/authlocal.go @@ -14,9 +14,9 @@ import ( "github.com/labstack/echo/v4" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers" + "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" ) // 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 4f0a5b1ca7..41410c1d00 100644 --- a/src/jetstream/authnone.go +++ b/src/jetstream/authnone.go @@ -11,14 +11,14 @@ import ( "github.com/labstack/echo/v4" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" ) const ( noAuthUserID = "10000000-1111-2222-3333-444444444444" ) -//More fields will be moved into here as global portalProxy struct is phased out +// More fields will be moved into here as global portalProxy struct is phased out type noAuth struct { databaseConnectionPool *sql.DB localUserScope string @@ -30,22 +30,22 @@ func (a *noAuth) ShowConfig(config *api.ConsoleConfig) { log.Info("... !!!!! No Authentication !!!!!") } -//Login provides no-auth specific Stratos login +// Login provides no-auth specific Stratos login func (a *noAuth) Login(c echo.Context) error { return errors.New("can not login when there is no auth") } -//Logout provides no-auth specific Stratos login +// Logout provides no-auth specific Stratos login func (a *noAuth) Logout(c echo.Context) error { return a.logout(c) } -//GetUsername gets the user name for the specified local user +// GetUsername gets the user name for the specified local user func (a *noAuth) GetUsername(userid string) (string, error) { return api.DefaultAdminUserName, nil } -//GetUser gets the user guid for the specified local user +// GetUser gets the user guid for the specified local user func (a *noAuth) GetUser(userGUID string) (*api.ConnectedUser, error) { var scopes = make([]string, 1) scopes[0] = "stratos.noauth" @@ -84,12 +84,12 @@ func (a *noAuth) BeforeVerifySession(c echo.Context) { } } -//VerifySession for no authentication - always passes +// VerifySession for no authentication - always passes func (a *noAuth) VerifySession(c echo.Context, sessionUser string, sessionExpireTime int64) error { return nil } -//generateLoginSuccessResponse +// generateLoginSuccessResponse func (a *noAuth) generateLoginSuccessResponse(c echo.Context, userGUID string, username string) error { log.Debug("generateLoginResponse") @@ -129,7 +129,7 @@ func (a *noAuth) generateLoginSuccessResponse(c echo.Context, userGUID string, u return err } -//logout +// logout func (a *noAuth) logout(c echo.Context) error { log.Debug("logout") diff --git a/src/jetstream/authuaa.go b/src/jetstream/authuaa.go index 14909ad7bd..2da0cdac7e 100644 --- a/src/jetstream/authuaa.go +++ b/src/jetstream/authuaa.go @@ -15,8 +15,8 @@ import ( "github.com/labstack/echo/v4" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/stringutils" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 f482f60269..ba06736880 100644 --- a/src/jetstream/cnsi.go +++ b/src/jetstream/cnsi.go @@ -16,9 +16,9 @@ import ( "crypto/sha1" "encoding/base64" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userfavorites/userfavoritesendpoints" + "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" ) const dbReferenceError = "unable to establish a database reference: '%v'" diff --git a/src/jetstream/cnsi_test.go b/src/jetstream/cnsi_test.go index 45725f319b..92fe618a4a 100644 --- a/src/jetstream/cnsi_test.go +++ b/src/jetstream/cnsi_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" - mock_api "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/mock" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/testutils" + "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/golang/mock/gomock" _ "github.com/satori/go.uuid" . "github.com/smartystreets/goconvey/convey" diff --git a/src/jetstream/crypto/crypto.go b/src/jetstream/crypto/crypto.go index 2400550cd2..aa5e34d770 100644 --- a/src/jetstream/crypto/crypto.go +++ b/src/jetstream/crypto/crypto.go @@ -24,14 +24,14 @@ func GenerateRandomBytes(n int) ([]byte, error) { } -//HashPassword accepts a plaintext password string and generates a salted hash +// HashPassword accepts a plaintext password string and generates a salted hash func HashPassword(password string) ([]byte, error) { bytes, err := bcrypt.GenerateFromPassword([]byte(password), 14) return bytes, err } -//CheckPasswordHash accepts a bcrypt salted hash and plaintext password. -//It verifies the password against the salted hash +// CheckPasswordHash accepts a bcrypt salted hash and plaintext password. +// It verifies the password against the salted hash func CheckPasswordHash(password string, hash []byte) error { err := bcrypt.CompareHashAndPassword(hash, []byte(password)) return err diff --git a/src/jetstream/custom_errors/custom_errors.go b/src/jetstream/custom_errors/custom_errors.go index 961b646bae..7cd694bfea 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-incubator/stratos/src/jetstream/custom_errors/constants" + "github.com/cloudfoundry-community/stratos/src/jetstream/custom_errors/constants" ) type GooseDBNoDatabaseVersionsFoundError struct{} diff --git a/src/jetstream/datastore/20200117152200_SesssionData.go b/src/jetstream/datastore/20200117152200_SesssionData.go index 85f489bc07..586494ef68 100644 --- a/src/jetstream/datastore/20200117152200_SesssionData.go +++ b/src/jetstream/datastore/20200117152200_SesssionData.go @@ -10,15 +10,15 @@ func init() { goose.AddMigration(Up20200117152200, nil) } func Up20200117152200(txn *sql.Tx) error { - sessionDataTable := "CREATE TABLE IF NOT EXISTS session_data (" - sessionDataTable += " session VARCHAR(255) NOT NULL," - sessionDataTable += " groupName VARCHAR(32) NOT NULL," - sessionDataTable += " name VARCHAR(64) NOT NULL," - sessionDataTable += " value TEXT NOT NULL," - sessionDataTable += " keep_on_expire BOOLEAN NOT NULL DEFAULT FALSE," - sessionDataTable += " expired BOOLEAN NOT NULL DEFAULT FALSE);" + sessionDataTable := "CREATE TABLE IF NOT EXISTS session_data (" + sessionDataTable += " session VARCHAR(255) NOT NULL," + sessionDataTable += " groupName VARCHAR(32) NOT NULL," + sessionDataTable += " name VARCHAR(64) NOT NULL," + sessionDataTable += " value TEXT NOT NULL," + sessionDataTable += " keep_on_expire BOOLEAN NOT NULL DEFAULT FALSE," + sessionDataTable += " expired BOOLEAN NOT NULL DEFAULT FALSE);" + + _, err := txn.Exec(sessionDataTable) + return err - _, err := txn.Exec(sessionDataTable) - return err - } diff --git a/src/jetstream/datastore/20200814140918_ApiKeys.go b/src/jetstream/datastore/20200814140918_ApiKeys.go index 1161d4f84f..011d9daa47 100644 --- a/src/jetstream/datastore/20200814140918_ApiKeys.go +++ b/src/jetstream/datastore/20200814140918_ApiKeys.go @@ -10,15 +10,15 @@ func init() { goose.AddMigration(Up20200814140918, nil) } func Up20200814140918(txn *sql.Tx) error { - apiTokenTable := "CREATE TABLE IF NOT EXISTS api_keys (" - apiTokenTable += "guid VARCHAR(36) NOT NULL UNIQUE," - apiTokenTable += "secret VARCHAR(64) NOT NULL UNIQUE," - apiTokenTable += "user_guid VARCHAR(36) NOT NULL," - apiTokenTable += "comment VARCHAR(255) NOT NULL," - apiTokenTable += "last_used TIMESTAMP," - apiTokenTable += "PRIMARY KEY (guid) );" + apiTokenTable := "CREATE TABLE IF NOT EXISTS api_keys (" + apiTokenTable += "guid VARCHAR(36) NOT NULL UNIQUE," + apiTokenTable += "secret VARCHAR(64) NOT NULL UNIQUE," + apiTokenTable += "user_guid VARCHAR(36) NOT NULL," + apiTokenTable += "comment VARCHAR(255) NOT NULL," + apiTokenTable += "last_used TIMESTAMP," + apiTokenTable += "PRIMARY KEY (guid) );" + + _, err := txn.Exec(apiTokenTable) + return err - _, err := txn.Exec(apiTokenTable) - return err - } diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go index afd9077c88..24c9f1bb07 100644 --- a/src/jetstream/datastore/datastore.go +++ b/src/jetstream/datastore/datastore.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/custom_errors" + "github.com/cloudfoundry-community/stratos/src/jetstream/custom_errors" "github.com/samber/lo" - goosedbversion "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/goose-db-version" + goosedbversion "github.com/cloudfoundry-community/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 d627df231c..435ccbc4ea 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-incubator/stratos/src/jetstream/plugins/backup" - _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundryhosting" - _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/metrics" - _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userfavorites" - _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userinfo" + _ "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" ) diff --git a/src/jetstream/diagnostics.go b/src/jetstream/diagnostics.go index 77acb0e02c..0f5b6f88eb 100644 --- a/src/jetstream/diagnostics.go +++ b/src/jetstream/diagnostics.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" - goosedbversion "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/goose-db-version" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + goosedbversion "github.com/cloudfoundry-community/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 7a4359d180..cd6d2d7931 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-incubator/stratos/src/jetstream/repository/cnsis" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens" + "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" ) // DefaultStoreFactory is default factory for getting store interfaces diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod index febf961994..e5d74700e7 100644 --- a/src/jetstream/go.mod +++ b/src/jetstream/go.mod @@ -1,18 +1,20 @@ -module github.com/cloudfoundry-incubator/stratos/src/jetstream +module github.com/cloudfoundry-community/stratos/src/jetstream -go 1.21.0 +go 1.21 + +toolchain go1.21.9 replace ( - github.com/cloudfoundry-incubator/stratos/src/jetstream/api => ./api - github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config => ./api/config - github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto => ./crypto - github.com/cloudfoundry-incubator/stratos/src/jetstream/docs => ./docs - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfapppush => ./plugins/cfapppush - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundry => ./plugins/cloudfoundry - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes => ./plugins/kubernetes - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth => ./plugins/kubernetes/auth - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/terminal => ./plugins/kubernetes/terminal - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular => ./plugins/monocular + 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 ) // ported from plugins/kubernetes @@ -26,15 +28,14 @@ replace ( require ( code.cloudfoundry.org/go-log-cache v1.0.1-0.20230224210401-5e305670b626 code.cloudfoundry.org/go-loggregator/v8 v8.0.5 - github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 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-incubator/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfapppush v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes v0.0.0-20210416105629-f34f428ca775 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular v0.0.0-20210416105629-f34f428ca775 + 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/noaa/v2 v2.3.0 github.com/cloudfoundry/sonde-go v0.0.0-20230911203642-fa89d986ae20 github.com/domodwyer/mailyak v3.1.1+incompatible @@ -50,6 +51,7 @@ require ( github.com/mattn/go-sqlite3 v1.14.17 github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f github.com/pressly/goose v2.7.0+incompatible + github.com/samber/lo v1.38.1 github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/smartystreets/goconvey v1.8.1 @@ -192,7 +194,6 @@ require ( github.com/rubenv/sql-migrate v1.3.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect - github.com/samber/lo v1.38.1 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/smarty/assertions v1.15.0 // indirect github.com/spf13/cast v1.5.0 // indirect diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum index 34cd2ab163..8293799c8b 100644 --- a/src/jetstream/go.sum +++ b/src/jetstream/go.sum @@ -111,8 +111,6 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/O github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/a8m/expect v1.0.0/go.mod h1:4IwSCMumY49ScypDnjNbYEjgVeqy1/U2cEs3Lat96eA= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= diff --git a/src/jetstream/http_basic_requests.go b/src/jetstream/http_basic_requests.go index a8b2a5bd20..ff5135b04c 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 3ca10c36da..19e534c2d0 100644 --- a/src/jetstream/info.go +++ b/src/jetstream/info.go @@ -6,18 +6,18 @@ import ( "net/http" "strings" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) // Endpoint - This represents the CNSI endpoint type Endpoint struct { - GUID string `json:"guid"` - Name string `json:"name"` - Version string `json:"version"` + GUID string `json:"guid"` + Name string `json:"name"` + Version string `json:"version"` User *api.ConnectedUser `json:"user"` - CNSIType string `json:"type"` + CNSIType string `json:"type"` } func (p *portalProxy) info(c echo.Context) error { diff --git a/src/jetstream/jwt.go b/src/jetstream/jwt.go index 1955335199..3e1cb34ebb 100644 --- a/src/jetstream/jwt.go +++ b/src/jetstream/jwt.go @@ -8,7 +8,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 d4846309ca..d6a51a2e4e 100644 --- a/src/jetstream/load_plugins.go +++ b/src/jetstream/load_plugins.go @@ -1,10 +1,10 @@ package main import ( - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/yamlgenerated" + "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/yamlgenerated" ) func (pp *portalProxy) loadPlugins() { diff --git a/src/jetstream/localusers.go b/src/jetstream/localusers.go index 0bbb4d8ccf..c25a1454f1 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-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers" + "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" ) func (p *portalProxy) FindUserGUID(c echo.Context) (string, error) { diff --git a/src/jetstream/localusers_test.go b/src/jetstream/localusers_test.go index b7a0b392ef..c63233a400 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers" + "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/smartystreets/goconvey/convey" ) diff --git a/src/jetstream/main.go b/src/jetstream/main.go index 127edb880d..2b0b2ae717 100644 --- a/src/jetstream/main.go +++ b/src/jetstream/main.go @@ -20,8 +20,8 @@ import ( "syscall" "time" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/custombinder" - _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/docs" + "github.com/cloudfoundry-community/stratos/src/jetstream/custombinder" + _ "github.com/cloudfoundry-community/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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/factory" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/apikeys" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/cnsis" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/console_config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/sessiondata" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens" + "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" ) // @title Stratos API diff --git a/src/jetstream/main_test.go b/src/jetstream/main_test.go index 2c9d8d6f1a..fd06817f66 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-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 2b4cfdd48d..03e048382b 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api/config" ) const cfSessionCookieName = "JSESSIONID" diff --git a/src/jetstream/middleware_test.go b/src/jetstream/middleware_test.go index efb9d5d6bd..9d0352b694 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" - mock_api "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/mock" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/apikeys" - mock_apikeys "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/apikeys/mock" + "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/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 3813b5eced..8a53c3f763 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/factory" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens" + "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-incubator/stratos/src/jetstream/plugins/cloudfoundry" + "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cloudfoundry" ) type mockServer struct { diff --git a/src/jetstream/noauth_requests.go b/src/jetstream/noauth_requests.go index 0acd41ec85..a750cf1f24 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/oauth_requests.go b/src/jetstream/oauth_requests.go index 27bfd32dec..030c428e42 100644 --- a/src/jetstream/oauth_requests.go +++ b/src/jetstream/oauth_requests.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 bc89010ee5..d9982ad816 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/testutils" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 e35d5c174f..1fbd0be98e 100644 --- a/src/jetstream/oidc_requests.go +++ b/src/jetstream/oidc_requests.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go index 3aae3597cc..6198d0b946 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 812588298b..e5d2d21e6a 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/testutils" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 80be589427..ac1029fdbb 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-incubator/stratos/src/jetstream/plugins/analysis/store" + "github.com/cloudfoundry-community/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 3c8b763109..47f679dcc1 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-incubator/stratos/src/jetstream/plugins/analysis/store" + "github.com/cloudfoundry-community/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 0b82fafa36..587e0500b1 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-incubator/stratos/src/jetstream/plugins/analysis/store" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 157c6e1a68..5cb048a77e 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-incubator/stratos/src/jetstream/plugins/analysis/store" + "github.com/cloudfoundry-community/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 5635589289..3fac589e77 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-incubator/stratos/src/jetstream/plugins/analysis/store" + "github.com/cloudfoundry-community/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 1dd79b3136..b1cf4bbe98 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-incubator/stratos/src/jetstream/datastore" + "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" ) var ( diff --git a/src/jetstream/plugins/autoscaler/main.go b/src/jetstream/plugins/autoscaler/main.go index 935b9fb443..bd74b8f06b 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 f347057d6d..078992328f 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-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 15c2bd1fa8..b37256c369 100644 --- a/src/jetstream/plugins/backup/main.go +++ b/src/jetstream/plugins/backup/main.go @@ -6,8 +6,8 @@ import ( "net/http" "strconv" - goosedbversion "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/goose-db-version" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + goosedbversion "github.com/cloudfoundry-community/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 46593bc12b..123e8f3184 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 20c0ff0265..b703ba10eb 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 0add99ea4f..ba361d74fa 100644 --- a/src/jetstream/plugins/cfapppush/go.mod +++ b/src/jetstream/plugins/cfapppush/go.mod @@ -1,9 +1,9 @@ -module github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfapppush +module github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfapppush -go 1.21.0 +go 1.21 replace ( - github.com/cloudfoundry-incubator/stratos/src/jetstream/api => ../../api + github.com/cloudfoundry-community/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-incubator/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 + github.com/cloudfoundry-community/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 53be029097..3b2991b8b9 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 08d1d4fff1..05ba83e4cf 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 5c5f96c430..dc958596af 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 7ab7aff46d..61c36e6e4f 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 8afc6839f5..8c4b531451 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 df7911eb32..19a54af52e 100644 --- a/src/jetstream/plugins/cloudfoundry/cf_websocket_streams.go +++ b/src/jetstream/plugins/cloudfoundry/cf_websocket_streams.go @@ -13,7 +13,7 @@ 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" "github.com/cloudfoundry/noaa/v2/consumer" "github.com/cloudfoundry/sonde-go/events" "github.com/gorilla/websocket" diff --git a/src/jetstream/plugins/cloudfoundry/main.go b/src/jetstream/plugins/cloudfoundry/main.go index 28b3b3d280..3694370e53 100644 --- a/src/jetstream/plugins/cloudfoundry/main.go +++ b/src/jetstream/plugins/cloudfoundry/main.go @@ -10,7 +10,7 @@ import ( "errors" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 52cc02ec29..d3faf45754 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" ) // Constants diff --git a/src/jetstream/plugins/desktop/cloudfoundry.go b/src/jetstream/plugins/desktop/cloudfoundry.go index f15f6bf04a..27b940a039 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 ac267b5776..865f222703 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 790e1c63fe..e3acb557be 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 fe1e7b3a79..e6b30afde1 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 2bcfa76502..1875064f83 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 41f06cb682..d1f2fbad5b 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 2d42fc3638..0961dc1efc 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-incubator/stratos/src/jetstream/plugins/kubernetes/auth" + "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 3152f4e1ca..2071094623 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 c4d924754e..d5ff9b874c 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 b17863d504..aad6b9e48d 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 5eb794c2c6..bc855a710b 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 f41843c8df..f0c26a88c3 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-incubator/stratos/src/jetstream/plugins/desktop/helm" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/desktop/kubernetes" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "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/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 096d5480ff..af06258247 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 b88439827f..eaae1c55f5 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 f7784c5938..3b788b73a1 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 14902a7dad..12fd369370 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 1537445e93..57722d2e42 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-incubator/stratos/src/jetstream/plugins/kubernetes/config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 c79656bac3..f764aee55c 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 5c95e7528d..657182e9a1 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 06ae7bc22e..690be1eab5 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 a8f37270ad..95c389671a 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-incubator/stratos/src/jetstream/plugins/kubernetes/auth +module github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth -go 1.21.0 +go 1.21 replace ( - github.com/cloudfoundry-incubator/stratos/src/jetstream/api => ../../../api - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes => ../../kubernetes + github.com/cloudfoundry-community/stratos/src/jetstream/api => ../../../api + github.com/cloudfoundry-community/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-incubator/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes v0.0.0-00010101000000-000000000000 + 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/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 b4e218466e..27713f2566 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-incubator/stratos/src/jetstream/plugins/kubernetes/config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 5a59275385..8361bbd7ea 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-incubator/stratos/src/jetstream/plugins/kubernetes/config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 b3c15cb6fd..fa4e3eb40f 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 194f86172f..1a3c52ed40 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 eaaf6c8a83..278432ab9d 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-incubator/stratos/src/jetstream/plugins/kubernetes/auth" + "github.com/cloudfoundry-community/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 14842402a4..350e41a1e2 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-incubator/stratos/src/jetstream/api/config" + "github.com/cloudfoundry-community/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 5168ba943e..5643f6586b 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 8b2a8fb727..89550d44d3 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 b0906f0b03..5dbe7bc0ef 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 fe8b714c51..76d28e5182 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 fde7122ddd..2827167455 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" ) const stratosServiceAccountSelector = "stratos-role%3Dkubernetes-dashboard-user" @@ -10,10 +10,10 @@ const stratosServiceAccountSelector = "stratos-role%3Dkubernetes-dashboard-user" func KubeDashboardStatus(p api.PortalProxy, endpointGUID, userGUID string, includeToken bool) (*StatusResponse, error) { status := &StatusResponse{ - Endpoint: endpointGUID, - Installed: false, - Running: false, - HasToken: false, + Endpoint: endpointGUID, + Installed: false, + Running: false, + HasToken: false, StratosInstalled: false, } diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go index 95d2c04677..81bf99a260 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 8db3dd31c1..14e2797ae8 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-incubator/stratos/src/jetstream/plugins/kubernetes/helm" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/helm" ) const ( diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod index 726efa3959..e853871f63 100644 --- a/src/jetstream/plugins/kubernetes/go.mod +++ b/src/jetstream/plugins/kubernetes/go.mod @@ -1,12 +1,12 @@ -module github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes +module github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes -go 1.21.0 +go 1.21 toolchain go1.21.5 require ( - github.com/cloudfoundry-incubator/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth v0.0.0-00010101000000-000000000000 + 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/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-incubator/stratos/src/jetstream => ../../../jetstream - github.com/cloudfoundry-incubator/stratos/src/jetstream/api => ../../../jetstream/api - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth => ./auth + 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/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 1853cd420c..700b3c7a3f 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 a02d01812f..7281498beb 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" log "github.com/sirupsen/logrus" "helm.sh/helm/v3/pkg/release" appsv1 "k8s.io/api/apps/v1" @@ -185,7 +185,7 @@ func (r *HelmRelease) processYamlResource(obj interface{}, data []byte) { } // process a yaml resource from the helm manifest -//func (r *HelmRelease) processResource(obj runtime.Object) { +// func (r *HelmRelease) processResource(obj runtime.Object) { func (r *HelmRelease) processKubeResource(obj interface{}, t KubeResource) { t.Resource = obj t.Manifest = true diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go index e6ddf45b23..e3a554a353 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" ) const chartCollection = "charts" @@ -90,7 +90,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error { kubeClient, _ := c.GetConfigForEndpointUser(endpointGUID, userGUID) clientset, _ := kubernetes.NewForConfig(kubeClient) coreclient := clientset.CoreV1() - ctx := context.Background() + ctx := context.Background() _, err = coreclient.Namespaces().Get(ctx, params.Namespace, metav1.GetOptions{}) if err != nil { return api.NewJetstreamErrorf("Namespace '%s' does not exist", params.Namespace) diff --git a/src/jetstream/plugins/kubernetes/kube_dashboard.go b/src/jetstream/plugins/kubernetes/kube_dashboard.go index 659a0d263a..146033c4fa 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-incubator/stratos/src/jetstream/plugins/kubernetes/dashboard" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 b7b302f5a6..77438b2b47 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 25510e0192..4803319077 100644 --- a/src/jetstream/plugins/kubernetes/main.go +++ b/src/jetstream/plugins/kubernetes/main.go @@ -11,13 +11,13 @@ import ( "errors" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth" + "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/terminal" + "github.com/cloudfoundry-community/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 2db2b74969..664c9bf6d8 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-incubator/stratos/src/jetstream/plugins/kubernetes/auth" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 baefe8864d..2064828eda 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 333722e2b2..1bd00835d7 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-incubator/stratos/src/jetstream/api" - jetstream_config "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/api" + 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" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/metrics/cloud_foundry.go b/src/jetstream/plugins/metrics/cloud_foundry.go index 768e16f18c..68afe4a1bb 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" ) var ( diff --git a/src/jetstream/plugins/metrics/main.go b/src/jetstream/plugins/metrics/main.go index d47431a8ea..01fc6b3f33 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 636123fb21..fa49e81093 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-incubator/stratos/src/jetstream/plugins/monocular/store" + "github.com/cloudfoundry-community/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 83fc13853b..8df58eace9 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-incubator/stratos/src/jetstream/plugins/monocular/store" + "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular/store" log "github.com/sirupsen/logrus" yaml "gopkg.in/yaml.v2" ) diff --git a/src/jetstream/plugins/monocular/chart.go b/src/jetstream/plugins/monocular/chart.go index 3b486aff12..e52050f2ec 100644 --- a/src/jetstream/plugins/monocular/chart.go +++ b/src/jetstream/plugins/monocular/chart.go @@ -54,8 +54,8 @@ type ChartVersion struct { Schema string `json:"schema"` } -//RepoCheck describes the state of a repository in terms its current checksum and last update time. -//It is used to determine whether or not to re-sync a respository. +// RepoCheck describes the state of a repository in terms its current checksum and last update time. +// It is used to determine whether or not to re-sync a respository. type RepoCheck struct { ID string `bson:"_id"` LastUpdate time.Time `bson:"last_update"` diff --git a/src/jetstream/plugins/monocular/chart_svc.go b/src/jetstream/plugins/monocular/chart_svc.go index 5df2a83cb6..5d4d127c2f 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-incubator/stratos/src/jetstream/plugins/monocular/store" + "github.com/cloudfoundry-community/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 5d0884d794..d959665893 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 3edda80284..934f5656a2 100644 --- a/src/jetstream/plugins/monocular/go.mod +++ b/src/jetstream/plugins/monocular/go.mod @@ -1,13 +1,13 @@ -module github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular +module github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular -go 1.21.0 +go 1.21 toolchain go1.21.5 require ( github.com/Masterminds/semver/v3 v3.2.1 - github.com/cloudfoundry-incubator/stratos/src/jetstream v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-incubator/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000 + 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/labstack/echo/v4 v4.11.3 github.com/pressly/goose v2.7.0+incompatible github.com/satori/go.uuid v1.2.0 @@ -31,22 +31,24 @@ require ( github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect + github.com/samber/lo v1.38.1 // indirect github.com/sclevine/spec v1.4.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect golang.org/x/crypto v0.17.0 // indirect + golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect ) -replace github.com/cloudfoundry-incubator/stratos/src/jetstream => ../../ +replace github.com/cloudfoundry-community/stratos/src/jetstream => ../../ -replace github.com/cloudfoundry-incubator/stratos/src/jetstream/api => ../../api +replace github.com/cloudfoundry-community/stratos/src/jetstream/api => ../../api -replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfapppush => ../cfapppush +replace github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfapppush => ../cfapppush -replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes => ../kubernetes +replace github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes => ../kubernetes -replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth => ../kubernetes/auth +replace github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes/auth => ../kubernetes/auth diff --git a/src/jetstream/plugins/monocular/go.sum b/src/jetstream/plugins/monocular/go.sum index 5f05e98c55..0b8c546c71 100644 --- a/src/jetstream/plugins/monocular/go.sum +++ b/src/jetstream/plugins/monocular/go.sum @@ -67,6 +67,8 @@ github.com/pressly/goose v2.7.0+incompatible/go.mod h1:m+QHWCqxR3k8D9l7qfzuC/djt github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= +github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= @@ -89,6 +91,8 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= +golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go index 0047f3a7f4..900f10e89f 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-incubator/stratos/src/jetstream/plugins/monocular/store" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 5061badf7c..26ca5b0f6e 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" ) diff --git a/src/jetstream/plugins/monocular/responses.go b/src/jetstream/plugins/monocular/responses.go index 036c9aa658..7141b4bdfa 100644 --- a/src/jetstream/plugins/monocular/responses.go +++ b/src/jetstream/plugins/monocular/responses.go @@ -16,18 +16,18 @@ limitations under the License. package monocular -//BodyAPIListResponse is an API body response in list format including the number of results pages +// BodyAPIListResponse is an API body response in list format including the number of results pages type BodyAPIListResponse struct { Data *APIListResponse `json:"data"` Meta Meta `json:"meta,omitempty"` } -//BodyAPIResponse is an API body response in non-list format +// BodyAPIResponse is an API body response in non-list format type BodyAPIResponse struct { Data APIResponse `json:"data"` } -//APIResponse is an API response in non-list format +// APIResponse is an API response in non-list format type APIResponse struct { ID string `json:"id"` Type string `json:"type"` @@ -36,24 +36,24 @@ type APIResponse struct { Relationships RelMap `json:"relationships"` } -//APIListResponse is an API response in list format +// APIListResponse is an API response in list format type APIListResponse []*APIResponse -//SelfLink the self-referencing URL to a chart in a response +// SelfLink the self-referencing URL to a chart in a response type SelfLink struct { Self string `json:"self"` } -//RelMap maps elements e.g. Charts to other elements of a response e.g. Chart Versions +// RelMap maps elements e.g. Charts to other elements of a response e.g. Chart Versions type RelMap map[string]Rel -//Rel describes a relationship between element(s) in a response +// Rel describes a relationship between element(s) in a response type Rel struct { Data interface{} `json:"data"` Links SelfLink `json:"links"` } -//Meta the number of pages in the response +// Meta the number of pages in the response type Meta struct { TotalPages int `json:"totalPages"` } diff --git a/src/jetstream/plugins/monocular/store/chart_store_db.go b/src/jetstream/plugins/monocular/store/chart_store_db.go index 5a7561898f..b89ddad654 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-incubator/stratos/src/jetstream/datastore" + "github.com/cloudfoundry-community/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 dd10c99f04..0bc89885e3 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 bf828a223f..bc1195ab59 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-incubator/stratos/src/jetstream/plugins/monocular/store" + "github.com/cloudfoundry-community/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 a0bc925e6e..a824593f05 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-incubator/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" + "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" "github.com/labstack/echo/v4" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 d7914ea81c..37fea8549d 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-incubator/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 512bd56361..25c51ce0bf 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-incubator/stratos/src/jetstream/plugins/userfavorites/userfavoritesstore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 723fc5183f..e5deb0dd35 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-incubator/stratos/src/jetstream/datastore" + "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" ) var ( diff --git a/src/jetstream/plugins/userinfo/local_user.go b/src/jetstream/plugins/userinfo/local_user.go index ac810aa12b..64571058e5 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/repository/localusers" ) // LocalUserInfo is a plugin to fetch user info @@ -145,7 +145,7 @@ func (userInfo *LocalUserInfo) UpdatePassword(id string, passwordInfo *passwordC return 200, nil } -//HashPassword accepts a plaintext password string and generates a salted hash +// HashPassword accepts a plaintext password string and generates a salted hash func HashPassword(password string) ([]byte, error) { bytes, err := bcrypt.GenerateFromPassword([]byte(password), 14) return bytes, err diff --git a/src/jetstream/plugins/userinfo/main.go b/src/jetstream/plugins/userinfo/main.go index dd2f099b4b..35401d65af 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 71c635314b..22cb682070 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 350ac04993..96ddddb171 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 4c66d40deb..d46ac7238e 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" ) type StatusResponse struct { diff --git a/src/jetstream/plugins/userinvite/auth.go b/src/jetstream/plugins/userinvite/auth.go index f2eda51c0c..f27f1405de 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 e735b41bb3..5783a5e7d9 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-incubator/stratos/src/jetstream/api/config" + "github.com/cloudfoundry-community/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 73c0bf98fd..9e9bbcc668 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 e3a04eb034..331e30f8b3 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 23d4770c47..9e868252d7 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 9295c46715..396c961832 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 6ac8cdda4a..c70bbe018d 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 846f68b6d0..3f721e3352 100644 --- a/src/jetstream/portal_config.go +++ b/src/jetstream/portal_config.go @@ -1,7 +1,7 @@ package main import ( - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 6e1a398d40..8ef7a3f823 100644 --- a/src/jetstream/portal_proxy.go +++ b/src/jetstream/portal_proxy.go @@ -5,8 +5,8 @@ import ( "regexp" "time" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/apikeys" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 9e6a9470fd..4a100f402e 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-incubator/stratos/src/jetstream/api" +import "github.com/cloudfoundry-community/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 7269066243..a53e8896db 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-incubator/stratos/src/jetstream/api" + api "github.com/cloudfoundry-community/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 30dce8734f..94bdbce7b6 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-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" + "github.com/cloudfoundry-community/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 4a3d0ad840..b61012992a 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" . "github.com/smartystreets/goconvey/convey" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) @@ -292,7 +292,6 @@ func TestDeleteAPIKey(t *testing.T) { }) } -// func TestUpdateAPIKeyLastUsed(t *testing.T) { var ( keyID = "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb" diff --git a/src/jetstream/repository/cnsis/pgsql_cnsis.go b/src/jetstream/repository/cnsis/pgsql_cnsis.go index e431dc2ae6..e289eba50e 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" + "github.com/cloudfoundry-community/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 282fd30759..dddf2f3cef 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/testutils" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 ab422c42fe..ac7a151982 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 37b1198292..9e892cfc28 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 ff6dbd7a50..e58d24acae 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-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 d94b86c61c..343231627d 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 7a340a5b17..4e35f08b37 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/custom_errors" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 de588f3830..1aa5058e5c 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/custom_errors" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 5a4a9458fc..0d11ffb608 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 4646616b0b..1381143ec6 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-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" log "github.com/sirupsen/logrus" ) @@ -98,7 +98,7 @@ func (p *PgsqlLocalUsersRepository) FindUserGUID(username string) (string, error return userGUID.String, nil } -//FindUser finds and returns meatdata for the given user +// FindUser finds and returns meatdata for the given user func (p *PgsqlLocalUsersRepository) FindUser(userGUID string) (api.LocalUser, error) { log.Debug("FindUser") @@ -145,7 +145,7 @@ func (p *PgsqlLocalUsersRepository) FindUser(userGUID string) (api.LocalUser, er return user, nil } -//FindUserScope selects the user_scope field from the local_users table in the db, for the given user. +// FindUserScope selects the user_scope field from the local_users table in the db, for the given user. func (p *PgsqlLocalUsersRepository) FindUserScope(userGUID string) (string, error) { log.Debug("FindUserScope") if userGUID == "" { @@ -169,8 +169,8 @@ func (p *PgsqlLocalUsersRepository) FindUserScope(userGUID string) (string, erro return userScope, nil } -//UpdateLastLoginTime called when a local user logs in. -//It updates the last_login timestamp field in the local_users table for the given user. +// UpdateLastLoginTime called when a local user logs in. +// It updates the last_login timestamp field in the local_users table for the given user. func (p *PgsqlLocalUsersRepository) UpdateLastLoginTime(userGUID string, loginTime time.Time) error { log.Debug("UpdateLastLoginTime") @@ -199,7 +199,7 @@ func (p *PgsqlLocalUsersRepository) UpdateLastLoginTime(userGUID string, loginTi return err } -//FindLastLoginTime selects the last_login field from the local_users table in the db, for the given user. +// FindLastLoginTime selects the last_login field from the local_users table in the db, for the given user. func (p *PgsqlLocalUsersRepository) FindLastLoginTime(userGUID string) (time.Time, error) { log.Debug("FindLastLoginTime") diff --git a/src/jetstream/repository/sessiondata/psql_sessiondata.go b/src/jetstream/repository/sessiondata/psql_sessiondata.go index c7b15a5be9..0f280dc4d1 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-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 f93af5648e..92e4bb272d 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" + "github.com/cloudfoundry-community/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 1c6cc13a91..ace6a38349 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-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 b2feff4901..0de501ff70 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/crypto" ) const ( diff --git a/src/jetstream/session_test.go b/src/jetstream/session_test.go index ca96f9950f..2a743297e6 100644 --- a/src/jetstream/session_test.go +++ b/src/jetstream/session_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/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 fca48fad3f..545e1615d9 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-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/console_config" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers" + "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" ) const ( diff --git a/src/jetstream/setup_console_test.go b/src/jetstream/setup_console_test.go index 7605ed4389..d78922e1bd 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-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/console_config" + "github.com/cloudfoundry-community/stratos/src/jetstream/datastore" + "github.com/cloudfoundry-community/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 e650a58914..ad50003c56 100644 --- a/src/jetstream/testutils/testhelpers.go +++ b/src/jetstream/testutils/testhelpers.go @@ -4,10 +4,10 @@ import ( "net/url" "time" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens" + "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" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/src/jetstream/version_info.go b/src/jetstream/version_info.go index dbfe31b43a..ad54d91517 100644 --- a/src/jetstream/version_info.go +++ b/src/jetstream/version_info.go @@ -4,8 +4,8 @@ import ( "errors" "net/http" - goosedbversion "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/goose-db-version" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/api" + "github.com/cloudfoundry-community/stratos/src/jetstream/api" + goosedbversion "github.com/cloudfoundry-community/stratos/src/jetstream/repository/goose-db-version" "github.com/labstack/echo/v4" log "github.com/sirupsen/logrus" )