diff --git a/cmd/clace/app_cmds.go b/cmd/clace/app_cmds.go index f47ad4a..bbc84d0 100644 --- a/cmd/clace/app_cmds.go +++ b/cmd/clace/app_cmds.go @@ -285,10 +285,10 @@ func appType(app types.AppResponse) string { func authType(app types.AppResponse) string { if app.Settings.AuthnType == types.AppAuthnNone { return "NONE" - } else if app.Settings.AuthnType == types.AppAuthnDefault { + } else if app.Settings.AuthnType == types.AppAuthnSystem { return "SYSTEM" - } else if app.Settings.AuthnType == "" { - return "----" + } else if app.Settings.AuthnType == types.AppAuthnDefault || app.Settings.AuthnType == "" { + return "DEFAULT" } else { return string(app.Settings.AuthnType) } diff --git a/tests/commander/test_reload.yaml b/tests/commander/test_reload.yaml index a5fc485..36f12c5 100644 --- a/tests/commander/test_reload.yaml +++ b/tests/commander/test_reload.yaml @@ -170,7 +170,7 @@ tests: stdout: exactly: "0" # no apps at 0e23273f82701c7ecb4f9f6b4e2a4c6ea154c0ec reload0506a: # check app list auth listing - command: '../clace app list --internal "/reload_git*" | grep SYST | wc -l' + command: '../clace app list --internal "/reload_git*" | grep DEFAULT | wc -l' stdout: exactly: "4" diff --git a/tests/commander/test_versions.yaml b/tests/commander/test_versions.yaml index a97dcf0..78cfb34 100644 --- a/tests/commander/test_versions.yaml +++ b/tests/commander/test_versions.yaml @@ -20,10 +20,10 @@ tests: command: curl -su "admin:qwerty" localhost:25222/versions_local1/abc/def/test.txt stdout: "abc" versions0060: # check list, four apps on version 1 - command: ../clace app list -i "/versions*" | grep "1 SYST" | wc -l + command: ../clace app list -i "/versions*" | grep "1 DEFAULT" | wc -l stdout: "4" versions0070: # check list, one dev app on version 0 - command: ../clace app list -i "/versions*" | grep "0 SYST" | wc -l + command: ../clace app list -i "/versions*" | grep "0 DEFAULT" | wc -l stdout: "1" versions0080: # update static file command: echo "22" > ./versionstest/static_root/rootfile.txt diff --git a/tests/test_basics.yaml b/tests/test_basics.yaml index 30d2860..5aa1dc0 100644 --- a/tests/test_basics.yaml +++ b/tests/test_basics.yaml @@ -113,6 +113,12 @@ tests: command: ../clace app create --dev --auth=default ./testapp /test3 exit-code: 0 + basic260a: # List shows auth as DEFAULT + command: "../clace app list --format csv /test3 | grep DEFAULT | wc -l" + stdout: + exactly: "1" + exit-code: 0 + basic270: # check curl works with password command: curl -sS -u "admin:abcd" localhost:9154/test3 stdout: "Test app body" @@ -147,7 +153,7 @@ tests: line-count: 4 contains: - "Type Version Auth" - - "PROD 1 SYST" + - "PROD 1 DEFAULT" exit-code: 0 basic510: # Test app list command with internal command: ../clace app list --internal