8000 Secret Source cleanup by mstoykov · Pull Request #4637 · grafana/k6 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Secret Source cleanup #4637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 21, 2025
Merged

Secret Source cleanup #4637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24a2b47
secretsource: mock: remove remnants of name being parse internally
mstoykov Mar 19, 2025
2ef1af1
secretsource: mock: refactor registered constructor in a separate fun…
mstoykov Mar 19, 2025
f5690b9
k6/secrets: typo
mstoykov Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/js/modules/k6/secrets/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (mi *Secrets) Exports() modules.Exports {
}
return modules.Exports{
Default: s,
Named: make(map[string]any), // this is intentionally not nil so it doesn't export anything as named expeorts
Named: make(map[string]any), // this is intentionally not nil so it doesn't export anything as named exports
}
}

Expand Down
22 changes: 11 additions & 11 deletions internal/js/modules/k6/secrets/secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestSecrets(t *testing.T) {
cases := map[string]secretsTest{
"simple": {
secretsources: map[string]secretsource.Source{
"default": mock.NewMockSecretSource("some", map[string]string{
"default": mock.NewMockSecretSource(map[string]string{
"secret": "value",
}),
},
Expand All @@ -46,7 +46,7 @@ func TestSecrets(t *testing.T) {
},
"error": {
secretsources: map[string]secretsource.Source{
"default": mock.NewMockSecretSource("some", map[string]string{
"default": mock.NewMockSecretSource(map[string]string{
"secret": "value",
}),
},
Expand All @@ -55,10 +55,10 @@ func TestSecrets(t *testing.T) {
},
"multiple": {
secretsources: map[string]secretsource.Source{
"default": mock.NewMockSecretSource("some", map[string]string{
"default": mock.NewMockSecretSource(map[string]string{
"secret": "value",
}),
"second": mock.NewMockSecretSource("some", map[string]string{
"second": mock.NewMockSecretSource(map[string]string{
"secret2": "value2",
}),
},
Expand All @@ -67,10 +67,10 @@ func TestSecrets(t *testing.T) {
},
"multiple get default": {
secretsources: map[string]secretsource.Source{
"default": mock.NewMockSecretSource("some", map[string]string{
"default": mock.NewMockSecretSource(map[string]string{
"secret": "value",
}),
"second": mock.NewMockSecretSource("some", map[string]string{
"second": mock.NewMockSecretSource(map[string]string{
"secret2": "value2",
}),
},
Expand All @@ -79,10 +79,10 @@ func TestSecrets(t *testing.T) {
},
"multiple get not default": {
10000 secretsources: map[string]secretsource.Source{
"default": mock.NewMockSecretSource("some", map[string]string{
"default": mock.NewMockSecretSource(map[string]string{
"secret": "value",
}),
"second": mock.NewMockSecretSource("some", map[string]string{
"second": mock.NewMockSecretSource(map[string]string{
"secret2": "value2",
}),
},
Expand All @@ -91,10 +91,10 @@ func TestSecrets(t *testing.T) {
},
"multiple get wrong": {
secretsources: map[string]secretsource.Source{
"default": mock.NewMockSecretSource("some", map[string]string{
"default": mock.NewMockSecretSource(map[string]string{
"secret": "value",
}),
"second": mock.NewMockSecretSource("some", map[string]string{
"second": mock.NewMockSecretSource(map[string]string{
"secret2": "value2",
}),
},
Expand All @@ -108,7 +108,7 @@ func TestSecrets(t *testing.T) {
},
"get none existing source": {
secretsources: map[string]secretsource.Source{
"default": mock.NewMockSecretSource("some", map[string]string{
"default": mock.NewMockSecretSource(map[string]string{
"secret": "value",
}),
},
Expand Down
35 changes: 15 additions & 20 deletions internal/secretsource/mock/mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,32 @@ import (
)

func init() {
secretsource.RegisterExtension("mock", func(params secretsource.Params) (secretsource.Source, error) {
list := strings.Split(params.ConfigArgument, ",")
secrets := make(map[string]string, len(list))
name := "mock"
for _, kv := range list {
k, v, ok := strings.Cut(kv, "=")
if !ok {
return nil, fmt.Errorf("parsing %q, needs =", kv)
}

secrets[k] = v
secretsource.RegisterExtension("mock", newMockSecretSourceFromParams)
}

func newMockSecretSourceFromParams(params secretsource.Params) (secretsource.Source, error) {
list := strings.Split(params.ConfigArgument, ",")
secrets := make(map[string]string, len(list))
for _, kv := range list {
k, v, ok := strings.Cut(kv, "=")
if !ok {
return nil, fmt.Errorf("parsing %q, needs =", kv)
}
return NewMockSecretSource(name, secrets), nil
})

secrets[k] = v
}
return NewMockSecretSource(secrets), nil
}

// NewMockSecretSource returns a new secret source mock with the provided name and map of secrets
func NewMockSecretSource(name string, secrets map[string]string) secretsource.Source {
func NewMockSecretSource(secrets map[string]string) secretsource.Source {
return &mockSecretSource{
internal: secrets,
name: name,
}
}

type mockSecretSource struct {
internal map[string]string
name string
}

func (mss *mockSecretSource) Name() string {
return mss.name
}

func (mss *mockSecretSource) Description() string {
Expand Down
Loading
0