Skip to content

no panic, no error, if no UserCredentialHandler in config #582

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

Open
stiidk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

no panic, no error, if no UserCredentialHandler in config #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,12 @@ func main() {
ocpHostURL := strings.TrimSuffix(ctrlConfig.OPAControlPlaneConfig.Address, "/")
opaControlPlaneClient = ocp.New(ocpHostURL, ctrlConfig.OPAControlPlaneConfig.Token)

s3Client, err = s3.NewClient(*ctrlConfig.UserCredentialHandler.S3)
if err != nil {
log.Error(err, "unable to create S3 client")
exit(err)
if ctrlConfig.UserCredentialHandler != nil && ctrlConfig.UserCredentialHandler.S3 != nil {
s3Client, err = s3.NewClient(*ctrlConfig.UserCredentialHandler.S3)
if err != nil {
log.Error(err, "unable to create S3 client")
exit(err)
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions internal/controller/styra/system_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,11 @@ func (r *SystemReconciler) reconcileS3Credentials(
uniqueName string,
secretName string,
) (s3.Credentials, ctrl.Result, error) {
if r.Config.UserCredentialHandler == nil || r.Config.UserCredentialHandler.S3 == nil {
log.Info("No UserCredentialHandler configured, returning empty S3 credentials")
return s3.Credentials{}, ctrl.Result{}, nil
}

s3Credentials := s3.Credentials{}
s3Credentials.Region = r.Config.UserCredentialHandler.S3.Region
s3Credentials.AccessKeyID = fmt.Sprintf("Access-Key-%s-%s", r.Config.UserCredentialHandler.S3.Bucket, uniqueName)
Expand Down
Loading