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.

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

Jump to bottom

NXP-29200: add user/group events in audit directories #4104

Merged
merged 1 commit into from Aug 20, 2020
Merged

NXP-29200: add user/group events in audit directories #4104

merged 1 commit into from Aug 20, 2020

Conversation

michaelva
Copy link
Contributor

No description provided.

@michaelva michaelva requested a review from a team as a code owner June 3, 2020 02:42
@ghost ghost requested review from bdelbosc and NourNuxeo and removed request for a team June 3, 2020 02:42
@nuxeojenkins
Copy link
Collaborator

View issue in JIRA: NXP-29200: Add user and group events/categories to platform audit directories

@nmpcunha
Copy link
Contributor

nmpcunha commented Jun 3, 2020

I believe this is also related to https://jira.nuxeo.com/browse/NXP-29175 (But not sure when it would be tackled)

@michaelva
Copy link
Contributor Author

@nmpcunha I believed it is slightly different here. This PR is to make the category and event types available in the UI filters which are directory suggestion widgets

NourNuxeo
NourNuxeo previously approved these changes Jun 4, 2020
View reviewed changes
NourNuxeo
NourNuxeo reviewed Jun 11, 2020
View reviewed changes
Copy link
Contributor

@NourNuxeo NourNuxeo left a comment

Choose a reason for hiding this comment

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

The new line commit is not worth a separate commit imho. I would make it a fixup:
git rebase -i head~2
then on the second line, replace "pick" by "f"
then :wq!
then
git push -f

@michaelva
Copy link
Contributor Author

@NourNuxeo I always squash when merging

@michaelva michaelva requested a review from NourNuxeo June 12, 2020 06:37
@NourNuxeo
Copy link
Contributor

not sure it's useful to keep "NXP-29200: add new line eof" in the final commit message 🤷‍♂️

@kevinleturc
Copy link
Member

T&P needed.

@kevinleturc kevinleturc removed their request for review June 18, 2020 09:38
@michaelva michaelva force-pushed the feature-NXP-29200-add-user-group-events branch from 3a880df to 0dd24da Compare June 18, 2020 23:51
ataillefer
ataillefer reviewed Jun 22, 2020
View reviewed changes
Copy link
Member

@ataillefer ataillefer left a comment

Choose a reason for hiding this comment

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

@michaelva the only thing missing is a T&P, do you want me to run it?

@NourNuxeo
Copy link
Contributor

ran it 3 times without success:
https://qa.nuxeo.org/jenkins/view/TestAndPush/job/TestAndPush/job/ondemand-testandpush-nalkotob/159
https://qa.nuxeo.org/jenkins/view/TestAndPush/job/TestAndPush/job/ondemand-testandpush-nalkotob/160
https://qa.nuxeo.org/jenkins/view/TestAndPush/job/TestAndPush/job/ondemand-testandpush-nalkotob/161

The tests are ok but some errors are logged consistently. You need to check in the log files. The console points this in particular:

08:29:03 2020-07-02T03:51:16,604 ERROR [main] [org.nuxeo.ecm.directory.DirectoryCSVLoader] Invalid column count while reading CSV file: nxblob-9564763030034943956.tmp, line: 7```

@michaelva
Copy link
Contributor Author

thanks @NourNuxeo I have tried several times too and same result on my side.

@michaelva michaelva force-pushed the feature-NXP-29200-add-user-group-events branch from 0dd24da to da26c4d Compare July 2, 2020 08:40
@ataillefer
Copy link
Member

@NourNuxeo we've just solved it, error logs were indeed relevant, problem was some extra commas at the end of the CSV lines.

@michaelva
Copy link
Contributor Author

thanks a lot @ataillefer for noticing. I pushed an update and started a new T&P

@michaelva
Copy link
Contributor Author

test and push passed: https://qa.nuxeo.org/jenkins/job/TestAndPush/job/ondemand-testandpush-mvachette/16/

ataillefer
ataillefer previously approved these changes Jul 3, 2020
View reviewed changes
NourNuxeo
NourNuxeo previously approved these changes Jul 3, 2020
View reviewed changes
@bdelbosc bdelbosc removed their request for review July 20, 2020 07:48
@troger
Copy link
Member

troger commented Jul 22, 2020

@michaelva anything blocking you to merge the PR?

@troger troger dismissed stale reviews from NourNuxeo and ataillefer via a43e66f August 19, 2020 08:05
@troger troger force-pushed the feature-NXP-29200-add-user-group-events branch from da26c4d to a43e66f Compare August 19, 2020 08:05
@troger
Copy link
Member

troger commented Aug 19, 2020

I've rebased the branch on origin/master to get up to date statuses.

@troger troger force-pushed the feature-NXP-29200-add-user-group-events branch from a43e66f to 3747e49 Compare August 19, 2020 20:01
@troger troger merged commit a71b346 into master Aug 20, 2020
@troger troger deleted the feature-NXP-29200-add-user-group-events branch August 20, 2020 09:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ataillefer ataillefer ataillefer approved these changes

@kevinleturc kevinleturc kevinleturc approved these changes

@NourNuxeo NourNuxeo NourNuxeo left review comments

@troger troger Awaiting requested review from troger

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
7 participants
@michaelva @nuxeojenkins @nmpcunha @NourNuxeo @kevinleturc @ataillefer @troger