Skip to content
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

Enable expand env for oidc discovery provider #5689

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
+53 −7
Open

Enable expand env for oidc discovery provider #5689

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
47fbedd
Enable expand env for oidc discovery provider
kfox1111 Dec 7, 2024
c21665f
Fix test
kfox1111 Dec 7, 2024
b017176
Fix lint
kfox1111 Dec 7, 2024
0144a98
Merge branch 'main' into oidc-expand-env
kfox1111 Dec 12, 2024
5d1ca12
Merge branch 'main' into oidc-expand-env
kfox1111 Dec 12, 2024
e4700bb
Merge branch 'main' into oidc-expand-env
kfox1111 Dec 12, 2024
cabd6d1
Merge branch 'main' into oidc-expand-env
kfox1111 Dec 13, 2024
efc60c5
Merge branch 'main' into oidc-expand-env
kfox1111 Dec 16, 2024
d50cef5
Merge branch 'main' into oidc-expand-env
kfox1111 Dec 17, 2024
232e8f6
Merge branch 'main' into oidc-expand-env
kfox1111 Dec 17, 2024
6367e22
Add test
kfox1111 Dec 18, 2024
e34bd9d
Fix lint
kfox1111 Dec 18, 2024
5c543f2
Fix Lint
kfox1111 Dec 18, 2024
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
9 changes: 7 additions & 2 deletions support/oidc-discovery-provider/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"time"

"github.com/hashicorp/hcl"
"github.com/spiffe/spire/pkg/common/config"
"github.com/zeebo/errs"
)

Expand Down Expand Up @@ -185,12 +186,16 @@ type experimentalWorkloadAPIConfig struct {
NamedPipeName string `hcl:"named_pipe_name" json:"named_pipe_name"`
}

func LoadConfig(path string) (*Config, error) {
func LoadConfig(path string, expandEnv bool) (*Config, error) {
hclBytes, err := os.ReadFile(path)
if err != nil {
return nil, errs.New("unable to load configuration: %v", err)
}
return ParseConfig(string(hclBytes))
hclString := string(hclBytes)
if expandEnv {
hclString = config.ExpandEnv(hclString)
}
return ParseConfig(hclString)
}

func ParseConfig(hclConfig string) (_ *Config, err error) {
Expand Down
4 changes: 2 additions & 2 deletions support/oidc-discovery-provider/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ func TestLoadConfig(t *testing.T) {

confPath := filepath.Join(dir, "test.conf")

_, err := LoadConfig(confPath)
_, err := LoadConfig(confPath, false)
require.Error(err)
require.Contains(err.Error(), "unable to load configuration:")

err = os.WriteFile(confPath, []byte(minimalServerAPIConfig), 0600)
require.NoError(err)

config, err := LoadConfig(confPath)
config, err := LoadConfig(confPath, false)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test case that expands environment variables defined in the config and verifies that the expansion works as expected?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. I'll add a test for it.

require.NoError(err)

require.Equal(&Config{
Expand Down
7 changes: 4 additions & 3 deletions support/oidc-discovery-provider/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
var (
versionFlag = flag.Bool("version", false, "print version")
configFlag = flag.String("config", "oidc-discovery-provider.conf", "configuration file")
expandEnv = flag.Bool("expandEnv", false, "expand environment variables in config file")
)

func main() {
Expand All @@ -35,14 +36,14 @@ func main() {
os.Exit(0)
}

if err := run(*configFlag); err != nil {
if err := run(*configFlag, *expandEnv); err != nil {
fmt.Fprintf(os.Stderr, "%+v\n", err)
os.Exit(1)
}
}

func run(configPath string) error {
config, err := LoadConfig(configPath)
func run(configPath string, expandEnv bool) error {
config, err := LoadConfig(configPath, expandEnv)
if err != nil {
return err
}
Expand Down
Loading