gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-05 20:40:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(cli): Update the cloud config command (#9676)

Browse Source
This commit is contained in:
Owen Rumney
2025-10-20 16:57:08 +01:00
committed by GitHub
parent 2c43425e05
commit 559fe1fa2c
17 changed files with 931 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
pkg/cloud/config_test.go
View File

@@ -27,17 +27,25 @@ func TestSave(t *testing.T) {
{
name: "config with all fields",
config: &Config{
Token: "test-token-123",
ServerURL: "https://example.com",
ApiURL: "https://api.example.com",
Token: "test-token-123",
Server: Server{
URL: "https://example.com",
},
Api: Api{
URL: "https://api.example.com",
},
},
wantErr: false,
},
{
name: "config without token",
config: &Config{
ServerURL: "https://example.com",
ApiURL: "https://api.example.com",
Server: Server{
URL: "https://example.com",
},
Api: Api{
URL: "https://api.example.com",
},
},
wantErr: false,
},
@@ -67,7 +75,7 @@ func TestSave(t *testing.T) {
assert.Equal(t, tt.config, config)
configPath := getConfigPath()
if tt.config.ServerURL != "" || tt.config.ApiURL != "" {
if tt.config.Server.URL != "" || tt.config.Api.URL != "" {
assert.FileExists(t, configPath)
}
})
@@ -102,8 +110,10 @@ func TestClear(t *testing.T) {
if tt.createConfig {
config := &Config{
Token: "testtoken",
ServerURL: "https://example.com",
Token: "testtoken",
Server: Server{
URL: "https://example.com",
},
}
err := config.Save()
require.NoError(t, err)
@@ -153,9 +163,13 @@ func TestLoad(t *testing.T) {
token := "testtoken"
if tt.createConfig {
config := &Config{
Token: token,
ServerURL: "https://example.com",
ApiURL: "https://api.example.com",
Token: token,
Server: Server{
URL: "https://example.com",
},
Api: Api{
URL: "https://api.example.com",
},
}
err := config.Save()
require.NoError(t, err)
@@ -169,8 +183,8 @@ func TestLoad(t *testing.T) {
require.NotNil(t, config)
require.NoError(t, err)
assert.Equal(t, token, config.Token)
assert.Equal(t, "https://example.com", config.ServerURL)
assert.Equal(t, "https://api.example.com", config.ApiURL)
assert.Equal(t, "https://example.com", config.Server.URL)
assert.Equal(t, "https://api.example.com", config.Api.URL)
})
}
}
@@ -184,7 +198,7 @@ func TestVerify(t *testing.T) {
}{
{
name: "success with valid config",
config: &Config{Token: "testtoken", ServerURL: "https://example.com", ApiURL: "https://api.example.com"},
config: &Config{Token: "testtoken", Server: Server{URL: "https://example.com"}, Api: Api{URL: "https://api.example.com"}},
status: http.StatusOK,
wantErr: false,
},
@@ -211,7 +225,7 @@ func TestVerify(t *testing.T) {
}))
defer server.Close()
tt.config.ServerURL = server.URL
tt.config.Server.URL = server.URL
err := tt.config.Verify(context.Background())
if tt.wantErr {
@@ -223,21 +237,60 @@ func TestVerify(t *testing.T) {
}
}
func TestShowConfig(t *testing.T) {
func TestListConfig(t *testing.T) {
tests := []struct {
name string
config *Config
primeToken bool
setupConfig *Config
wantErr string
wantContains []string
}{
{
name: "success with valid config",
config: &Config{Token: "testtoken", ServerURL: "https://example.com", ApiURL: "https://api.example.com"},
name: "success with valid config",
primeToken: true,
setupConfig: &Config{
Token: "testtoken",
Server: Server{
URL: "https://example.com",
Scanning: Scanning{
Enabled: true,
UploadResults: false,
SecretConfig: true,
MisconfigConfig: false,
},
},
Api: Api{URL: "https://api.example.com"},
},
wantContains: []string{
"Trivy Cloud Configuration",
"Trivy Server URL: https://example.com",
"API URL: https://api.example.com",
"Logged In: No",
"Logged In: No",
"Filepath:",
"api.url",
"https://api.example.com",
"server.url",
"https://example.com",
"server.scanning.enabled",
"Enabled",
"server.scanning.upload-results",
"Disabled",
"server.scanning.secret-config",
"server.scanning.misconfig-config",
},
},
{
name: "success with default config",
setupConfig: nil,
wantContains: []string{
"Trivy Cloud Configuration",
"Logged In: No",
"api.url",
DefaultApiUrl,
"server.url",
DefaultTrivyServerUrl,
"server.scanning.enabled",
"server.scanning.upload-results",
"server.scanning.secret-config",
"server.scanning.misconfig-config",
},
},
}
@@ -251,8 +304,13 @@ func TestShowConfig(t *testing.T) {
defer keyring.DeleteAll(ServiceName)
defer Clear()
if tt.config != nil {
err := tt.config.Save()
if tt.primeToken {
// prime the token in the keyring so the custom config doesn't get overwritten
require.NoError(t, keyring.Set(ServiceName, TokenKey, tt.setupConfig.Token))
}
if tt.setupConfig != nil {
err := tt.setupConfig.Save()
require.NoError(t, err)
}
@@ -264,7 +322,7 @@ func TestShowConfig(t *testing.T) {
errChan := make(chan error, 1)
go func() {
errChan <- ShowConfig()
errChan <- ListConfig()
w.Close()
}()