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

No file contents fix in "spacewalk-report config-files" #2764

Merged
merged 4 commits into from
Dec 7, 2020

Conversation

vzhestkov
Copy link
Contributor

What does this PR change?

Fixes the issue: #2484

GUI diff

Before:

# spacewalk-report.orig config-files
org_id,channel_id,channel,channel_type,path,file_type,file_id,revision,is_binary,contents,delim_start,delim_end,username,groupname,filemode,symbolic_link,selinux_ctx
1,1,test-label,normal,/tmp/jom-test,file,2,1,N,<memory at 0x7f4c0d3531c8>,{|,|},root,root,644,,
1,1,test-label,normal,/tmp/test,file,1,1,N,<memory at 0x7f4c0d353288>,{|,|},root,root,644,,
1,1,test-label,normal,/tmp/test-bin,file,9,1,Y,<memory at 0x7f4c0d3531c8>,{|,|},root,root,644,,
1,2,test-state,state,/init.sls,sls,3,1,N,<memory at 0x7f4c0d353288>,{|,|},root,root,644,,
1,6,test-state-imp,state,/init.sls,sls,7,1,N,<memory at 0x7f4c0d3531c8>,{|,|},root,root,644,,

After:

# spacewalk-report config-files
org_id,channel_id,channel,channel_type,path,file_type,file_id,revision,is_binary,contents,delim_start,delim_end,username,groupname,filemode,symbolic_link,selinux_ctx
1,1,test-label,normal,/tmp/jom-test,file,2,1,N,"just one more test
еще один тест",{|,|},root,root,644,,
1,1,test-label,normal,/tmp/test,file,1,1,N,"just a test
просто тест
",{|,|},root,root,644,,
1,1,test-label,normal,/tmp/test-bin,file,9,1,Y,<binary data>,{|,|},root,root,644,,
1,2,test-state,state,/init.sls,sls,3,1,N,"test-file-mgmt:
  file.managed:
    - name: /tmp/test
    - content: |
      just a test
      one more",{|,|},root,root,644,,
1,6,test-state-imp,state,/init.sls,sls,7,1,N,,{|,|},root,root,644,,

Documentation

  • No documentation needed: restoring the original behavior

Test coverage

  • No tests: already covered

Links

Fixes #2484

Changelogs

  • Fixes no file content in spacewalk-report config-files
  • Write <binary data> placeholder instead of dumping binary data to the output

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

  • Re-run test "changelog_test"
  • Re-run test "backend_unittests_pgsql"
  • Re-run test "ruby_rubocop"
  • Re-run test "schema_migration_test_pgsql"
  • Re-run test "susemanager_unittests"

reporting/spacewalk-reports.changes Outdated Show resolved Hide resolved
@mcalmer mcalmer requested a review from brejoc October 30, 2020 15:08
Copy link
Contributor

@brejoc brejoc left a comment

Choose a reason for hiding this comment

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

lgtm!

@mcalmer
Copy link
Contributor

mcalmer commented Dec 5, 2020

@vzhestkov all approved but not merged yet, why?

@vzhestkov vzhestkov merged commit c792fa4 into uyuni-project:master Dec 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No file contents in "spacewalk-report config-files"
3 participants