-
Notifications
You must be signed in to change notification settings - Fork 337
feat(secrets): Add new secrets management package #797
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.
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
Open
hsmatulis
wants to merge
1
commit into
prometheus:main
Choose a base branch
from
hsmatulis:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # Secret Management | ||
|
|
||
| The `secrets` package provides a unified way to handle secrets within configuration files for Prometheus and its ecosystem components. It allows secrets to be specified inline, loaded from files, or fetched from other sources through a pluggable provider mechanism. | ||
|
|
||
| See the rendered [GoDoc here](https://pkg.go.dev/github.com/prometheus/common/secrets) if on GitHub. | ||
|
|
||
| ## How to Use | ||
|
|
||
| Using the `secrets` package involves three main steps: defining your configuration struct, initializing the secret manager, and accessing the secret values. Refer to the [package example GoDoc](https://pkg.go.dev/github.com/prometheus/common/secrets#example-package). | ||
|
|
||
|
|
||
| ## Built-in Providers | ||
|
|
||
| The `secrets` package comes with two built-in providers: `inline` and `file`. For more details, please refer to the [GoDoc](https://pkg.go.dev/github.com/prometheus/common/secrets#pkg-variables). | ||
|
|
||
| ## Custom Providers | ||
|
|
||
| You can extend the functionality by creating your own custom secret providers. For a detailed guide on creating custom providers, please refer to the [GoDoc for the `Provider` and `ProviderConfig` interfaces](https://pkg.go.dev/github.com/prometheus/common/secrets#Provider). | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Copyright 2025 The Prometheus Authors | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Package secrets provides a unified way to handle secrets within | ||
| // configuration files for Prometheus and its ecosystem components. It allows | ||
| // secrets to be specified inline, loaded from files, or fetched from other | ||
| // sources through a pluggable provider mechanism. | ||
| package secrets |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,100 @@ | ||||||
| // Copyright 2025 The Prometheus Authors | ||||||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||||||
| // you may not use this file except in compliance with the License. | ||||||
| // You may obtain a copy of the License at | ||||||
| // | ||||||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||||||
| // | ||||||
| // Unless required by applicable law or agreed to in writing, software | ||||||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||||||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||
| // See the License for the specific language governing permissions and | ||||||
| // limitations under the License. | ||||||
|
|
||||||
| package secrets_test | ||||||
|
|
||||||
| import ( | ||||||
| "context" | ||||||
| "fmt" | ||||||
| "os" | ||||||
| "time" | ||||||
|
|
||||||
| "github.com/prometheus/client_golang/prometheus" | ||||||
| "go.yaml.in/yaml/v2" | ||||||
|
|
||||||
| "github.com/prometheus/common/secrets" | ||||||
| ) | ||||||
|
|
||||||
| func Example() { | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice! nit: We likely want some name for this example to make this wrong, but maybe it works like that too? Happy to merge and learn.
Suggested change
|
||||||
| // A Prometheus registry is needed to register the secret manager's metrics. | ||||||
| promRegisterer := prometheus.NewRegistry() | ||||||
|
|
||||||
| // Create a temporary file to simulate a file-based secret (e.g., Kubernetes mount). | ||||||
| passwordFile, err := os.CreateTemp("", "password_secret") | ||||||
| if err != nil { | ||||||
| panic(err) | ||||||
| } | ||||||
| defer os.Remove(passwordFile.Name()) | ||||||
|
|
||||||
| if _, err := passwordFile.WriteString("my_super_secret_password"); err != nil { | ||||||
| passwordFile.Close() | ||||||
| panic(err) | ||||||
| } | ||||||
| passwordFile.Close() | ||||||
|
|
||||||
| // In your configuration struct, use the `secrets.Field` type for any fields | ||||||
| // that should contain secrets. | ||||||
| type MyConfig struct { | ||||||
| APIKey secrets.Field `yaml:"api_key"` | ||||||
| Password secrets.Field `yaml:"password"` | ||||||
| } | ||||||
|
|
||||||
| // Users can then provide secrets in their YAML configuration file. | ||||||
| // We inject the temporary file path created above. | ||||||
| configData := []byte(fmt.Sprintf(` | ||||||
| api_key: "my_super_secret_api_key" | ||||||
| password: | ||||||
| file: | ||||||
| path: %s | ||||||
| `, passwordFile.Name())) | ||||||
|
|
||||||
| var cfg MyConfig | ||||||
| if err := yaml.Unmarshal(configData, &cfg); err != nil { | ||||||
| panic(fmt.Errorf("error unmarshaling config: %w", err)) | ||||||
| } | ||||||
|
|
||||||
| // Create a secret manager. This discovers and manages all Fields in cfg. | ||||||
| // The manager will handle refreshing secrets in the background. | ||||||
| manager, err := secrets.NewManager(promRegisterer, secrets.Providers, &cfg) | ||||||
| if err != nil { | ||||||
| panic(fmt.Errorf("error creating secret manager: %w", err)) | ||||||
| } | ||||||
|
|
||||||
| // Start the manager's background refresh loop. | ||||||
| manager.Start(context.Background()) | ||||||
| defer manager.Stop() | ||||||
|
|
||||||
| // Wait for the secrets in cfg to be resolved and ready. | ||||||
| for { | ||||||
| ready, err := manager.SecretsReady(&cfg) | ||||||
| if err != nil { | ||||||
| panic(fmt.Errorf("error checking secret readiness: %w", err)) | ||||||
| } | ||||||
| if ready { | ||||||
| break | ||||||
| } | ||||||
| // Prevent a busy loop while waiting for I/O | ||||||
| time.Sleep(100 * time.Millisecond) | ||||||
| } | ||||||
|
|
||||||
| // Access the secret values. | ||||||
| apiKey := cfg.APIKey.Get() | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. very cool use! |
||||||
| password := cfg.Password.Get() | ||||||
|
|
||||||
| fmt.Printf("API Key: %s\n", apiKey) | ||||||
| fmt.Printf("Password: %s\n", password) | ||||||
|
|
||||||
| // Output: | ||||||
| // API Key: my_super_secret_api_key | ||||||
| // Password: my_super_secret_password | ||||||
| } | ||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice!
One thing to discuss/put in README.
How it relates to
common/config/config.go
Line 28 in d80d854
What would be the plan forward? Deprecate
config.Secret?