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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jobs list and node read fixes #56

Merged
merged 3 commits into from Apr 15, 2019
Merged

jobs list and node read fixes #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ce169e
only show report button on scan job list if not recurring job
Apr 13, 2019
5169319
do not fail node read if secret does not exist
Apr 13, 2019
3271fc0
Update components/nodemanager-service/api/nodes/server/server.go
stevendanna Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...omate-ui/src/app/pages/+compliance/+scanner/containers/jobs-list/jobs-list.component.html
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@
<chef-td>{{ job.status }}</chef-td>
<chef-td>
<chef-button secondary
*ngIf="job.status === 'completed'"
*ngIf="job.status === 'completed' && job.recurrence === ''"
(click)="viewReport(job.id)">
Report
</chef-button>
Expand Down
3 changes: 2 additions & 1 deletion components/nodemanager-service/api/nodes/server/server.go
View file
Open in desktop
Expand Up @@ -208,7 +208,8 @@ func getSecretsAgg(ctx context.Context, secretIds []string, secretsClient secret
arrMap := make(map[string]string, 0)
s, err := secretsClient.Read(ctx, &secrets.Id{Id: id})
if err != nil {
return nil, errors.Wrap(err, "GetSecretsAgg error")
logrus.WithError(err).Errorf("could not read credential %q", id)
continue
}

for _, kv := range s.Data {
Expand Down