This is an automated email from the ASF dual-hosted git repository.
sciabarracom pushed a commit to branch 0.9.0
in repository https://gitbox.apache.org/repos/asf/openserverless-cli.git
The following commit(s) were added to refs/heads/0.9.0 by this push:
new 0ae40fc rebranded cli
0ae40fc is described below
commit 0ae40fcce310e0c3a08925befe3442d460e29112
Author: Michele Sciabarra <[email protected]>
AuthorDate: Thu Sep 10 23:40:11 2026 +0200
rebranded cli
---
README.md | 2 +-
auth/login.go | 6 +++---
auth/login_test.go | 2 +-
config/sso_tool.go | 12 ++++++------
config/sso_tool_test.go | 40 ++++++++++++++++++++--------------------
docs/SSO.md | 10 +++++-----
tests/awk.bats | 4 ++--
tests/login.bats | 6 +++---
8 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/README.md b/README.md
index 1f514b8..1c21e60 100644
--- a/README.md
+++ b/README.md
@@ -207,7 +207,7 @@ The following environment variables are always set and you
**can override** them
- `OPS_TMP` is a temporary folder where you can store temp files - defaults to
`~/.ops/tmp`
- `OPS_APIHOST` is the host for `ops -login`. It is used in place of the first
argument of `ops -login`. If empty, the
command will expect the first argument to be the apihost.
-- `OPS_USER` is set the username for `ops -login`. The default is `nuvolaris`.
It can be overriden by passing the
+- `OPS_USER` is set the username for `ops -login`. The default is
`openserverless`. It can be overriden by passing the
username as an argument to `ops -login` or by setting the environment
variable.
- `OPS_PASSWORD`: set the password for `ops -login`. If not set, `ops -login`
will prompt for the password. It is useful
for tests and non-interactive environments.
diff --git a/auth/login.go b/auth/login.go
index 3c61a09..7798879 100644
--- a/auth/login.go
+++ b/auth/login.go
@@ -86,7 +86,7 @@ type backendDevicePollResponse struct {
const usage = `Usage:
ops -login [options] <apihost> [<user>]
-Login to an OpenServerless instance. If no user is specified, the default user
"nuvolaris" is used.
+Login to an OpenServerless instance. If no user is specified, the default user
"openserverless" is used.
You can set the environment variables OPS_APIHOST and OPS_USER to avoid
specifying them on the command line.
You can set OPS_PASSWORD to avoid entering the password interactively.
When SSO is enabled, set OPS_SSO_LOGIN_FLOW=password or pass --sso-flow
password to use
@@ -105,8 +105,8 @@ const oidcLoginPath = "/system/api/v1/auth/oidc"
const oidcDeviceStartPath = "/system/api/v1/auth/oidc/device/start"
const oidcDevicePollPath = "/system/api/v1/auth/oidc/device/poll"
const oidcPasswordPath = "/system/api/v1/auth/oidc/password"
-const defaultUser = "nuvolaris"
-const opsSecretServiceName = "nuvolaris"
+const defaultUser = "openserverless"
+const opsSecretServiceName = "openserverless"
func LoginCmd() (*LoginResult, error) {
diff --git a/auth/login_test.go b/auth/login_test.go
index 11bb2cd..0c6815f 100644
--- a/auth/login_test.go
+++ b/auth/login_test.go
@@ -84,7 +84,7 @@ func TestLoginCmd(t *testing.T) {
})
t.Run("with only apihost, add received credentials", func(t *testing.T)
{
- mockServer := setupMockServer(t, "nuvolaris", "a password",
"{\"AUTH\": \"test\"}")
+ mockServer := setupMockServer(t, "openserverless", "a
password", "{\"AUTH\": \"test\"}")
defer mockServer.Close()
oldPwdReader := pwdReader
diff --git a/config/sso_tool.go b/config/sso_tool.go
index 9e533ea..83c87d0 100644
--- a/config/sso_tool.go
+++ b/config/sso_tool.go
@@ -29,11 +29,11 @@ import (
)
const (
- defaultSSONamespace = "nuvolaris"
+ defaultSSONamespace = "openserverless"
defaultSSOConfigMap = "openserverless-sso-config"
defaultSSOSecret = "openserverless-sso-secret"
- defaultSSOWorkload = "nuvolaris-system-api"
- defaultSSOContainer = "nuvolaris-system-api"
+ defaultSSOWorkload = "openserverless-system-api"
+ defaultSSOContainer = "openserverless-system-api"
)
type commandRunner func(name string, args []string, stdin []byte) ([]byte,
error)
@@ -142,11 +142,11 @@ Options:
--groups-claim CLAIM OIDC groups claim. Default: groups
--client-id CLIENT_ID OIDC client id. Defaults to --audience when omitted
--client-secret SECRET OIDC confidential client secret stored only in
Kubernetes Secret
- --namespace NS Kubernetes namespace. Default: nuvolaris
+ --namespace NS Kubernetes namespace. Default: openserverless
--configmap NAME Kubernetes ConfigMap name. Default:
openserverless-sso-config
--secret NAME Kubernetes Secret name. Default:
openserverless-sso-secret
- --statefulset NAME admin-api StatefulSet name. Default:
nuvolaris-system-api
- --container NAME admin-api container name. Default:
nuvolaris-system-api
+ --statefulset NAME admin-api StatefulSet name. Default:
openserverless-system-api
+ --container NAME admin-api container name. Default:
openserverless-system-api
--no-rollout Do not restart or wait for admin-api rollout
`)
}
diff --git a/config/sso_tool_test.go b/config/sso_tool_test.go
index 9f10229..4176813 100644
--- a/config/sso_tool_test.go
+++ b/config/sso_tool_test.go
@@ -168,8 +168,8 @@ func TestConfigSSOToolKeycloak(t *testing.T) {
require.Len(t, commands, 3)
require.Equal(t, []string{"apply", "-f", "-"}, commands[0].args)
- require.Equal(t, []string{"-n", "nuvolaris", "get", "statefulset",
"nuvolaris-system-api", "-o", "json"}, commands[1].args)
- require.Equal(t, []string{"-n", "nuvolaris", "patch", "statefulset",
"nuvolaris-system-api", "--type=json", "-p", commands[2].args[7]},
commands[2].args)
+ require.Equal(t, []string{"-n", "openserverless", "get", "statefulset",
"openserverless-system-api", "-o", "json"}, commands[1].args)
+ require.Equal(t, []string{"-n", "openserverless", "patch",
"statefulset", "openserverless-system-api", "--type=json", "-p",
commands[2].args[7]}, commands[2].args)
var cmObj map[string]interface{}
require.NoError(t, json.Unmarshal([]byte(commands[0].stdin), &cmObj))
@@ -217,10 +217,10 @@ func TestConfigSSOToolKeycloakRollsOutAdminAPIByDefault(t
*testing.T) {
require.Len(t, commands, 5)
require.Equal(t, []string{"apply", "-f", "-"}, commands[0].args)
- require.Equal(t, []string{"-n", "nuvolaris", "get", "statefulset",
"nuvolaris-system-api", "-o", "json"}, commands[1].args)
- require.Equal(t, []string{"-n", "nuvolaris", "patch", "statefulset",
"nuvolaris-system-api", "--type=json", "-p", commands[2].args[7]},
commands[2].args)
- require.Equal(t, []string{"-n", "nuvolaris", "rollout", "restart",
"statefulset/nuvolaris-system-api"}, commands[3].args)
- require.Equal(t, []string{"-n", "nuvolaris", "rollout", "status",
"statefulset/nuvolaris-system-api", "--timeout=180s"}, commands[4].args)
+ require.Equal(t, []string{"-n", "openserverless", "get", "statefulset",
"openserverless-system-api", "-o", "json"}, commands[1].args)
+ require.Equal(t, []string{"-n", "openserverless", "patch",
"statefulset", "openserverless-system-api", "--type=json", "-p",
commands[2].args[7]}, commands[2].args)
+ require.Equal(t, []string{"-n", "openserverless", "rollout", "restart",
"statefulset/openserverless-system-api"}, commands[3].args)
+ require.Equal(t, []string{"-n", "openserverless", "rollout", "status",
"statefulset/openserverless-system-api", "--timeout=180s"}, commands[4].args)
}
func TestConfigSSOToolKeycloakWithClientSecret(t *testing.T) {
@@ -281,8 +281,8 @@ func TestConfigSSOToolKeycloakWithClientSecret(t
*testing.T) {
secretData := secretObj["stringData"].(map[string]interface{})
require.Equal(t, "super-secret", secretData["OIDC_CLIENT_SECRET"])
- require.Equal(t, []string{"-n", "nuvolaris", "get", "statefulset",
"nuvolaris-system-api", "-o", "json"}, commands[2].args)
- require.Equal(t, []string{"-n", "nuvolaris", "patch", "statefulset",
"nuvolaris-system-api", "--type=json", "-p", commands[3].args[7]},
commands[3].args)
+ require.Equal(t, []string{"-n", "openserverless", "get", "statefulset",
"openserverless-system-api", "-o", "json"}, commands[2].args)
+ require.Equal(t, []string{"-n", "openserverless", "patch",
"statefulset", "openserverless-system-api", "--type=json", "-p",
commands[3].args[7]}, commands[3].args)
require.Contains(t, commands[3].args[7], "custom-sso-secret")
}
@@ -336,10 +336,10 @@ func TestConfigSSOToolDisable(t *testing.T) {
},
}, gotConfig)
require.Len(t, commands, 4)
- require.Equal(t, []string{"-n", "nuvolaris", "get", "statefulset",
"nuvolaris-system-api", "-o", "json"}, commands[0].args)
- require.Equal(t, []string{"-n", "nuvolaris", "patch", "statefulset",
"nuvolaris-system-api", "--type=json", "-p", commands[1].args[7]},
commands[1].args)
- require.Equal(t, []string{"-n", "nuvolaris", "delete", "configmap",
"openserverless-sso-config", "--ignore-not-found"}, commands[2].args)
- require.Equal(t, []string{"-n", "nuvolaris", "delete", "secret",
"openserverless-sso-secret", "--ignore-not-found"}, commands[3].args)
+ require.Equal(t, []string{"-n", "openserverless", "get", "statefulset",
"openserverless-system-api", "-o", "json"}, commands[0].args)
+ require.Equal(t, []string{"-n", "openserverless", "patch",
"statefulset", "openserverless-system-api", "--type=json", "-p",
commands[1].args[7]}, commands[1].args)
+ require.Equal(t, []string{"-n", "openserverless", "delete",
"configmap", "openserverless-sso-config", "--ignore-not-found"},
commands[2].args)
+ require.Equal(t, []string{"-n", "openserverless", "delete", "secret",
"openserverless-sso-secret", "--ignore-not-found"}, commands[3].args)
}
func TestConfigSSOToolDisableWaitsForAdminAPIRolloutByDefault(t *testing.T) {
@@ -363,11 +363,11 @@ func
TestConfigSSOToolDisableWaitsForAdminAPIRolloutByDefault(t *testing.T) {
require.NoError(t, err)
require.Len(t, commands, 5)
- require.Equal(t, []string{"-n", "nuvolaris", "get", "statefulset",
"nuvolaris-system-api", "-o", "json"}, commands[0].args)
- require.Equal(t, []string{"-n", "nuvolaris", "patch", "statefulset",
"nuvolaris-system-api", "--type=json", "-p", commands[1].args[7]},
commands[1].args)
- require.Equal(t, []string{"-n", "nuvolaris", "delete", "configmap",
"openserverless-sso-config", "--ignore-not-found"}, commands[2].args)
- require.Equal(t, []string{"-n", "nuvolaris", "delete", "secret",
"openserverless-sso-secret", "--ignore-not-found"}, commands[3].args)
- require.Equal(t, []string{"-n", "nuvolaris", "rollout", "status",
"statefulset/nuvolaris-system-api", "--timeout=180s"}, commands[4].args)
+ require.Equal(t, []string{"-n", "openserverless", "get", "statefulset",
"openserverless-system-api", "-o", "json"}, commands[0].args)
+ require.Equal(t, []string{"-n", "openserverless", "patch",
"statefulset", "openserverless-system-api", "--type=json", "-p",
commands[1].args[7]}, commands[1].args)
+ require.Equal(t, []string{"-n", "openserverless", "delete",
"configmap", "openserverless-sso-config", "--ignore-not-found"},
commands[2].args)
+ require.Equal(t, []string{"-n", "openserverless", "delete", "secret",
"openserverless-sso-secret", "--ignore-not-found"}, commands[3].args)
+ require.Equal(t, []string{"-n", "openserverless", "rollout", "status",
"statefulset/openserverless-system-api", "--timeout=180s"}, commands[4].args)
}
func TestConfigSSOToolDisableAlreadyAbsentDoesNotPatchOrRollOut(t *testing.T) {
@@ -392,9 +392,9 @@ func
TestConfigSSOToolDisableAlreadyAbsentDoesNotPatchOrRollOut(t *testing.T) {
require.NoError(t, ConfigSSOTool(cm, []string{"disable"}))
require.Len(t, commands, 3)
- require.Equal(t, []string{"-n", "nuvolaris", "get", "statefulset",
"nuvolaris-system-api", "-o", "json"}, commands[0].args)
- require.Equal(t, []string{"-n", "nuvolaris", "delete", "configmap",
"openserverless-sso-config", "--ignore-not-found"}, commands[1].args)
- require.Equal(t, []string{"-n", "nuvolaris", "delete", "secret",
"openserverless-sso-secret", "--ignore-not-found"}, commands[2].args)
+ require.Equal(t, []string{"-n", "openserverless", "get", "statefulset",
"openserverless-system-api", "-o", "json"}, commands[0].args)
+ require.Equal(t, []string{"-n", "openserverless", "delete",
"configmap", "openserverless-sso-config", "--ignore-not-found"},
commands[1].args)
+ require.Equal(t, []string{"-n", "openserverless", "delete", "secret",
"openserverless-sso-secret", "--ignore-not-found"}, commands[2].args)
}
func
TestConfigSSOToolPreservesForeignWorkloadFieldsAcrossEnableDisableEnable(t
*testing.T) {
diff --git a/docs/SSO.md b/docs/SSO.md
index 7172661..7a93a1a 100644
--- a/docs/SSO.md
+++ b/docs/SSO.md
@@ -89,17 +89,17 @@ The `0.9.0` deployment manifests and the SSO defaults use
different names:
| Resource | `0.9.0` deployment | Embedded SSO / `0.9.1` deployment |
| --- | --- | --- |
-| Namespace | `openserverless` | `nuvolaris` |
-| Admin-api StatefulSet and container | `openserverless-system-api` |
`nuvolaris-system-api` |
-| `WhiskUser` API version | `openserverless.org/v1` | `nuvolaris.org/v1` in
the `0.9.1` admin-api/operator |
+| Namespace | `openserverless` | `openserverless` |
+| Admin-api StatefulSet and container | `openserverless-system-api` |
`openserverless-system-api` |
+| `WhiskUser` API version | `openserverless.org/v1` | `openserverless.org/v1`
in the `0.9.1` admin-api/operator |
See the task repository's
[0.9.0 admin-api
template](https://github.com/apache/openserverless-task/blob/eeac57e4179381ee18fba290ab79d6cec1dafb09/setup/openserverless/system-api/api-template.yaml)
and the operator's
[0.9.0 WhiskUser
CRD](https://github.com/apache/openserverless-operator/blob/5df76feda569b374276f4e2c72a46d3a980a4b77/deploy/openserverless-permissions/whisk-user-crd.yaml).
The corresponding
-[0.9.1
CRD](https://github.com/apache/openserverless-operator/blob/fdcbbdf2332ae5aa8e22afba0704b37fdb1697bd/deploy/nuvolaris-permissions/whisk-user-crd.yaml)
-uses `nuvolaris.org`.
+[0.9.1
CRD](https://github.com/apache/openserverless-operator/blob/fdcbbdf2332ae5aa8e22afba0704b37fdb1697bd/deploy/openserverless-permissions/whisk-user-crd.yaml)
+uses `openserverless.org`.
`--namespace`, `--statefulset`, and `--container` select the resources patched
by the configuration command. They do not change the namespace or API group
diff --git a/tests/awk.bats b/tests/awk.bats
index ab4752a..e0274f6 100644
--- a/tests/awk.bats
+++ b/tests/awk.bats
@@ -44,8 +44,8 @@ setup() {
}
@test "-awk replace" {
- run echo "$(echo "Hello World" | ops -awk '{$2="Nuvolaris"; print $0}')"
- assert_line "Hello Nuvolaris"
+ run echo "$(echo "Hello World" | ops -awk '{$2="OpenServerless"; print
$0}')"
+ assert_line "Hello OpenServerless"
assert_success
}
diff --git a/tests/login.bats b/tests/login.bats
index f1f8557..3fc8f77 100644
--- a/tests/login.bats
+++ b/tests/login.bats
@@ -34,8 +34,8 @@ setup() {
@test "ops -login with OPS_PASSWORD env does not prompt for password" {
export OPS_PASSWORD=1234
- run ops -login nuvolaris.dev
- assert_line --partial "Logging in https://nuvolaris.dev";
+ run ops -login openserverless.dev
+ assert_line --partial "Logging in https://openserverless.dev";
refute_line "Enter Password:"
}
@@ -61,7 +61,7 @@ setup() {
unset OPS_USER
run ops -login
assert_failure
- assert_line "Logging in http://localhost as nuvolaris"
+ assert_line "Logging in http://localhost as openserverless"
}
@test "ops -login with OPS_APIHOST and OPS_USER env" {
