Skip to content

Commit

Permalink
fix panic due to missing logger of aws IdentityProvider (#2095)
Browse files Browse the repository at this point in the history
fix missing logger of aws IdentityProvider
  • Loading branch information
moukoublen committed Apr 8, 2024
1 parent 61b21ec commit 6bf970a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion internal/flavors/asset_inventory.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func initAwsFetchers(ctx context.Context, cfg *config.Config, logger *logp.Logge
return nil, err
}

idProvider := awslib.IdentityProvider{}
idProvider := awslib.IdentityProvider{Logger: logger}
awsIdentity, err := idProvider.GetIdentity(ctx, awsConfig)
if err != nil {
return nil, err
Expand Down
11 changes: 6 additions & 5 deletions internal/flavors/benchmark/strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,24 @@ type Strategy interface {
checkDependencies() error
}

func GetStrategy(cfg *config.Config) (Strategy, error) {
func GetStrategy(cfg *config.Config, log *logp.Logger) (Strategy, error) {
switch cfg.Benchmark {
case config.CIS_AWS:
if cfg.CloudConfig.Aws.AccountType == config.OrganizationAccount {
return &AWSOrg{
IAMProvider: &iam.Provider{},
IdentityProvider: awslib.IdentityProvider{},
IdentityProvider: awslib.IdentityProvider{Logger: log},
AccountProvider: awslib.AccountProvider{},
}, nil
}

return &AWS{
IdentityProvider: awslib.IdentityProvider{},
IdentityProvider: awslib.IdentityProvider{Logger: log},
}, nil
case config.CIS_EKS:
return &EKS{
AWSCfgProvider: awslib.ConfigProvider{MetadataProvider: awslib.Ec2MetadataProvider{}},
AWSIdentityProvider: awslib.IdentityProvider{},
AWSIdentityProvider: awslib.IdentityProvider{Logger: log},
AWSMetadataProvider: awslib.Ec2MetadataProvider{},
EKSClusterNameProvider: awslib.EKSClusterNameProvider{},
ClientProvider: k8s.ClientGetter{},
Expand All @@ -75,7 +75,8 @@ func GetStrategy(cfg *config.Config) (Strategy, error) {
case config.CIS_AZURE:
return &Azure{
cfgProvider: &azure_auth.ConfigProvider{AuthProvider: &azure_auth.AzureAuthProvider{}},
providerInitializer: &azurelib.ProviderInitializer{}}, nil
providerInitializer: &azurelib.ProviderInitializer{},
}, nil
}
return nil, fmt.Errorf("unknown benchmark: '%s'", cfg.Benchmark)
}
2 changes: 1 addition & 1 deletion internal/flavors/benchmark/strategy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func TestGetStrategy(t *testing.T) {
}
for _, tt := range tests {
t.Run(fmt.Sprintf("%T", tt.wantType), func(t *testing.T) {
got, err := GetStrategy(&tt.cfg)
got, err := GetStrategy(&tt.cfg, testhelper.NewLogger(t))
if tt.wantErr {
require.Error(t, err)
return
Expand Down
2 changes: 1 addition & 1 deletion internal/flavors/posture.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func newPostureFromCfg(b *beat.Beat, cfg *config.Config) (*posture, error) {
log.Info("Config initiated with cycle period of ", cfg.Period)
ctx, cancel := context.WithCancel(context.Background())

strategy, err := benchmark.GetStrategy(cfg)
strategy, err := benchmark.GetStrategy(cfg, log)
if err != nil {
cancel()
return nil, err
Expand Down

0 comments on commit 6bf970a

Please sign in to comment.