Skip to content

Commit

Permalink
Update repo from cloudfoundry-community/stratos to cloudfoundry/stratos
Browse files Browse the repository at this point in the history
  • Loading branch information
krutten committed Oct 31, 2024
1 parent 10da5ee commit 0e59cd8
Show file tree
Hide file tree
Showing 163 changed files with 318 additions and 315 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/backend_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
run: |
echo 'package main
// This file is auto-generated - DO NOT EDIT
import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/autoscaler"
import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cloudfoundry"
import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfapppush"
import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cfappssh"
import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userinvite"
import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/analysis"
import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/kubernetes"
import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/monocular"' > src/jetstream/extra_plugins.go
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/autoscaler"
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cloudfoundry"
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cfapppush"
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cfappssh"
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/userinvite"
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/analysis"
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes"
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular"' > src/jetstream/extra_plugins.go
- name: Run tests
run: build/bk-build.sh test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/tmp
/out-tsc
/out
/jetstream

# dependencies
/node_modules
Expand Down
24 changes: 13 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# Stratos

<a href="https://travis-ci.com/cloudfoundry-community/stratos/branches"><img src="https://travis-ci.com/cloudfoundry-community/stratos.svg?branch=master"></a>&nbsp;<a style="padding-left: 4px" href="https://codeclimate.com/github/cloudfoundry-community/stratos/maintainability"><img src="https://api.codeclimate.com/v1/badges/61af8b605f385e894632/maintainability" /></a>
<a href="https://goreportcard.com/report/github.com/cloudfoundry-community/stratos"><img src="https://goreportcard.com/badge/github.com/cloudfoundry-incubator/stratos"/></a>
<a style="padding-left: 4px" href="https://codeclimate.com/github/cloudfoundry-community/stratos/maintainability"><img src="https://api.codeclimate.com/v1/badges/61af8b605f385e894632/maintainability" /></a>
<a href="https://goreportcard.com/report/github.com/cloudfoundry/stratos"><img src="https://goreportcard.com/badge/github.com/cloudfoundry-incubator/stratos"/></a>
<a href="https://codecov.io/gh/cloudfoundry-community/stratos/branch/master"><img src="https://codecov.io/gh/cloudfoundry-community/stratos/branch/master/graph/badge.svg"/></a>
[![GitHub release](https://img.shields.io/github/release/cloudfoundry-community/stratos.svg)](https://github.com/cloudfoundry-community/stratos/releases/latest)
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/cloudfoundry-community/stratos/blob/master/LICENSE)
[![GitHub release](https://img.shields.io/github/release/cloudfoundry-community/stratos.svg)](https://github.com/cloudfoundry/stratos/releases/latest)
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/cloudfoundry/stratos/blob/master/LICENSE)
[![slack.cloudfoundry.org](https://slack.cloudfoundry.org/badge.svg)](https://cloudfoundry.slack.com/messages/C80EP4Y57/)

(Please note: The official repository is at cloudfoundry/stratos and the cloudfoundry-community/stratos will track this but may be used for some testing purposes)

Stratos is an Open Source Web-based UI (Console) for managing Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.

![Stratos Application view](website/static/images/screenshots/app-summary.png)

Please visit our new [documentation site](https://stratos.app/). There you can discover
Please visit our new [documentation site](https://stratos.app/). There you can discover (* This is currently being updated from the 4.4.0 docs)

1. Our [introduction](https://stratos.app/docs/), including quick start, contributing and troubleshooting guides.
1. How to [deploy](https://stratos.app/docs/deploy/overview) Stratos in a number of environments.
Expand All @@ -33,11 +35,11 @@ Tested with Browserstack


This feature helps in pre-building the
[Stratos](https://github.com/cloudfoundry-community/stratos) web application
[Stratos](https://github.com/cloudfoundry/stratos) web application
so that it can be deployed faster in Cloud Foundry, or be run offline.

You can find pre-built versions of Stratos UI in the
[releases](https://github.com/cloudfoundry-community/stratos/releases)
[releases](https://github.com/cloudfoundry/stratos/releases)
of this repository.

To run those `.zip` packages inside Cloud Foundry, unzip it, write a manifest,
Expand Down Expand Up @@ -67,18 +69,18 @@ Note: `sgs` creates security groups the first time, upgrades do not use `sgs`.

## Packaging

Golang is required, and version 1.12 is recommended as this is the version used by the Stratos build system.
Golang is required, and version 1.21 is recommended as this is the version used by the Stratos build system.

When you want to build the `4.1.2` tag in
[Stratos UI releases](https://github.com/cloudfoundry-community/stratos/releases),
When you want to build the `4.8.1` tag in
[Stratos UI releases](https://github.com/cloudfoundry/stratos/releases),
run this command:

```bash
./bin/package
```
OR to package a specific tag
```bash
TAG="4.1.2" ./bin/package
TAG="4.8.1" ./bin/package
```

### NOTE
Expand Down
2 changes: 1 addition & 1 deletion bin/package
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -xeuo pipefail
declare git_url git_tag work_dir
declare -x TAG NODE_VERSION TMP_DIR

git_url="https://github.com/cloudfoundry-community/stratos.git"
git_url="https://github.com/cloudfoundry/stratos.git"
git_tag="${TAG:-develop}"
work_dir="${PWD}"
NODE_VERSION="${NODE_VERISON:-20.13.1}"
Expand Down
2 changes: 1 addition & 1 deletion deploy/cloud-foundry/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ YELLOW="\033[93m"
RESET="\033[0m"
BOLD="\033[1m"

VENDOR_FOLDER=tmp/go/src/github.com/cloudfoundry-community/stratos/vendor
VENDOR_FOLDER=tmp/go/src/github.com/cloudfoundry/stratos/vendor

function log {
COLOR=${2:-}
Expand Down
2 changes: 1 addition & 1 deletion manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ applications:
disk_quota: 1024M
host: console
timeout: 180
buildpack: https://github.com/cloudfoundry-community/stratos-buildpack#v5
buildpack: https://github.com/cloudfoundry/stratos-buildpack#v5
health-check-type: port
# env:
# Override CF API endpoint URL inferred from VCAP_APPLICATION env
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stratos",
"version": "4.8.0",
"version": "4.8.1",
"description": "Stratos Console",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/packages/devkit/src/backend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (backendPlugins.length === 0) {

// Check that the plugin exists
if (fs.existsSync(path.join(backendFolder, 'plugins', pkg))) {
fs.appendFileSync(backendPluginsFile, `import _ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/${pkg}"\n`);
fs.appendFileSync(backendPluginsFile, `import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/${pkg}"\n`);
console.log(` + ${pkg}`)
} else {
console.log(` + ${pkg} : WARNING: Backend plugin does not exist`);
Expand Down
2 changes: 1 addition & 1 deletion src/jetstream/api/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/cloudfoundry-community/stratos/src/jetstream/api
module github.com/cloudfoundry/stratos/src/jetstream/api

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion src/jetstream/api/mock/mock_auth.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/jetstream/api/structs.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/url"
"reflect"

api "github.com/cloudfoundry-community/stratos/src/jetstream/api/config"
api "github.com/cloudfoundry/stratos/src/jetstream/api/config"
"github.com/gorilla/sessions"
"github.com/labstack/echo/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion src/jetstream/apikeys.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"net/http"

"github.com/cloudfoundry-community/stratos/src/jetstream/api/config"
"github.com/cloudfoundry/stratos/src/jetstream/api/config"
"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"
)
Expand Down
8 changes: 4 additions & 4 deletions src/jetstream/apikeys_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"net/http"
"testing"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry-community/stratos/src/jetstream/api/config"
mock_api "github.com/cloudfoundry-community/stratos/src/jetstream/api/mock"
mock_apikeys "github.com/cloudfoundry-community/stratos/src/jetstream/repository/apikeys/mock"
"github.com/cloudfoundry/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/api/config"
mock_api "github.com/cloudfoundry/stratos/src/jetstream/api/mock"
mock_apikeys "github.com/cloudfoundry/stratos/src/jetstream/repository/apikeys/mock"
"github.com/golang/mock/gomock"
"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion src/jetstream/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/labstack/echo/v4"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/api"
)

// LoginHookFunc - function that can be hooked into a successful user login
Expand Down
2 changes: 1 addition & 1 deletion src/jetstream/auth_providers.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/cloudfoundry-community/stratos/src/jetstream/api"
import "github.com/cloudfoundry/stratos/src/jetstream/api"

// log "github.com/sirupsen/logrus"

Expand Down
12 changes: 6 additions & 6 deletions src/jetstream/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import (

log "github.com/sirupsen/logrus"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry-community/stratos/src/jetstream/api/config"
mock_api "github.com/cloudfoundry-community/stratos/src/jetstream/api/mock"
"github.com/cloudfoundry-community/stratos/src/jetstream/crypto"
"github.com/cloudfoundry-community/stratos/src/jetstream/datastore"
"github.com/cloudfoundry-community/stratos/src/jetstream/testutils"
"github.com/cloudfoundry/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/api/config"
mock_api "github.com/cloudfoundry/stratos/src/jetstream/api/mock"
"github.com/cloudfoundry/stratos/src/jetstream/crypto"
"github.com/cloudfoundry/stratos/src/jetstream/datastore"
"github.com/cloudfoundry/stratos/src/jetstream/testutils"
. "github.com/smartystreets/goconvey/convey"
)

Expand Down
6 changes: 3 additions & 3 deletions src/jetstream/authcnsi.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry-community/stratos/src/jetstream/api/config"
"github.com/cloudfoundry-community/stratos/src/jetstream/repository/tokens"
"github.com/cloudfoundry/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/api/config"
"github.com/cloudfoundry/stratos/src/jetstream/repository/tokens"
)

// CFAdminIdentifier - The scope that Cloud Foundry uses to convey administrative level perms
Expand Down
6 changes: 3 additions & 3 deletions src/jetstream/authlocal.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (

"github.com/labstack/echo/v4"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry-community/stratos/src/jetstream/crypto"
"github.com/cloudfoundry-community/stratos/src/jetstream/repository/localusers"
"github.com/cloudfoundry/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/crypto"
"github.com/cloudfoundry/stratos/src/jetstream/repository/localusers"
)

// More fields will be moved into here as global portalProxy struct is phased out
Expand Down
2 changes: 1 addition & 1 deletion src/jetstream/authnone.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/labstack/echo/v4"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/api"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions src/jetstream/authuaa.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (

"github.com/labstack/echo/v4"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry-community/stratos/src/jetstream/stringutils"
"github.com/cloudfoundry/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/stringutils"
)

// UAAAdminIdentifier - The identifier that UAA uses to convey administrative level perms
Expand Down
6 changes: 3 additions & 3 deletions src/jetstream/cnsi.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"crypto/sha1"
"encoding/base64"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry-community/stratos/src/jetstream/api/config"
"github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userfavorites/userfavoritesendpoints"
"github.com/cloudfoundry/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/api/config"
"github.com/cloudfoundry/stratos/src/jetstream/plugins/userfavorites/userfavoritesendpoints"
)

const dbReferenceError = "unable to establish a database reference: '%v'"
Expand Down
8 changes: 4 additions & 4 deletions src/jetstream/cnsi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"testing"
"time"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry-community/stratos/src/jetstream/api/config"
mock_api "github.com/cloudfoundry-community/stratos/src/jetstream/api/mock"
"github.com/cloudfoundry-community/stratos/src/jetstream/testutils"
"github.com/cloudfoundry/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/api/config"
mock_api "github.com/cloudfoundry/stratos/src/jetstream/api/mock"
"github.com/cloudfoundry/stratos/src/jetstream/testutils"
"github.com/golang/mock/gomock"
_ "github.com/satori/go.uuid"
. "github.com/smartystreets/goconvey/convey"
Expand Down
2 changes: 1 addition & 1 deletion src/jetstream/custom_errors/custom_errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package custom_errors
import (
"fmt"

"github.com/cloudfoundry-community/stratos/src/jetstream/custom_errors/constants"
"github.com/cloudfoundry/stratos/src/jetstream/custom_errors/constants"
)

type GooseDBNoDatabaseVersionsFoundError struct{}
Expand Down
4 changes: 2 additions & 2 deletions src/jetstream/datastore/datastore.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"strings"
"time"

"github.com/cloudfoundry-community/stratos/src/jetstream/custom_errors"
"github.com/cloudfoundry/stratos/src/jetstream/custom_errors"
"github.com/samber/lo"

goosedbversion "github.com/cloudfoundry-community/stratos/src/jetstream/repository/goose-db-version"
goosedbversion "github.com/cloudfoundry/stratos/src/jetstream/repository/goose-db-version"
"github.com/govau/cf-common/env"
log "github.com/sirupsen/logrus"

Expand Down
10 changes: 5 additions & 5 deletions src/jetstream/default_plugins.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package main
// These imports bring in the default set of plugins

import (
_ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/backup"
_ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/cloudfoundryhosting"
_ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/metrics"
_ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userfavorites"
_ "github.com/cloudfoundry-community/stratos/src/jetstream/plugins/userinfo"
_ "github.com/cloudfoundry/stratos/src/jetstream/plugins/backup"
_ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cloudfoundryhosting"
_ "github.com/cloudfoundry/stratos/src/jetstream/plugins/metrics"
_ "github.com/cloudfoundry/stratos/src/jetstream/plugins/userfavorites"
_ "github.com/cloudfoundry/stratos/src/jetstream/plugins/userinfo"
)
4 changes: 2 additions & 2 deletions src/jetstream/diagnostics.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

log "github.com/sirupsen/logrus"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
goosedbversion "github.com/cloudfoundry-community/stratos/src/jetstream/repository/goose-db-version"
"github.com/cloudfoundry/stratos/src/jetstream/api"
goosedbversion "github.com/cloudfoundry/stratos/src/jetstream/repository/goose-db-version"
)

func (p *portalProxy) StoreDiagnostics() {
Expand Down
6 changes: 3 additions & 3 deletions src/jetstream/factory/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package factory
import (
"database/sql"

"github.com/cloudfoundry-community/stratos/src/jetstream/api"
"github.com/cloudfoundry-community/stratos/src/jetstream/repository/cnsis"
"github.com/cloudfoundry-community/stratos/src/jetstream/repository/tokens"
"github.com/cloudfoundry/stratos/src/jetstream/api"
"github.com/cloudfoundry/stratos/src/jetstream/repository/cnsis"
"github.com/cloudfoundry/stratos/src/jetstream/repository/tokens"
)

// DefaultStoreFactory is default factory for getting store interfaces
Expand Down
Loading

0 comments on commit 0e59cd8

Please sign in to comment.