Skip to content

Commit

Permalink
Fix federated config (#167)
Browse files Browse the repository at this point in the history
* Fix federated config

Signed-off-by: Faisal Memon <fymemon@yahoo.com>
  • Loading branch information
faisal-memon committed Jul 1, 2024
1 parent 5fc29f0 commit fc54f46
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions cmd/spiffe-helper/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ func NewSidecarConfig(config *Config, log logrus.FieldLogger) *sidecar.Config {
CmdArgs: config.CmdArgs,
CertDir: config.CertDir,
ExitWhenReady: config.ExitWhenReady,
IncludeFederatedDomains: config.IncludeFederatedDomains,
JWTBundleFilename: config.JWTBundleFilename,
Log: log,
RenewSignal: config.RenewSignal,
Expand Down
10 changes: 6 additions & 4 deletions cmd/spiffe-helper/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,11 @@ func TestDefaultAgentAddress(t *testing.T) {

func TestNewSidecarConfig(t *testing.T) {
config := &Config{
AgentAddress: "my-agent-address",
Cmd: "my-cmd",
CertDir: "my-cert-dir",
SVIDKeyFileName: "my-key",
AgentAddress: "my-agent-address",
Cmd: "my-cmd",
CertDir: "my-cert-dir",
SVIDKeyFileName: "my-key",
IncludeFederatedDomains: true,
JWTSVIDs: []JWTConfig{
{
JWTAudience: "my-audience",
Expand All @@ -373,6 +374,7 @@ func TestNewSidecarConfig(t *testing.T) {
assert.Equal(t, config.Cmd, sidecarConfig.Cmd)
assert.Equal(t, config.CertDir, sidecarConfig.CertDir)
assert.Equal(t, config.SVIDKeyFileName, sidecarConfig.SVIDKeyFileName)
assert.Equal(t, config.IncludeFederatedDomains, sidecarConfig.IncludeFederatedDomains)

// Ensure JWT Config was populated correctly
require.Equal(t, len(config.JWTSVIDs), len(sidecarConfig.JWTSVIDs))
Expand Down

0 comments on commit fc54f46

Please sign in to comment.