Skip to content

Conversation

kc284
Copy link

@kc284 kc284 commented Aug 28, 2025

This is simply a cherry pick of @lindig 's commit from #6547 now that we have fixed #6622. Let me know if anything more is needed.

CP-308455 VM.sysprep declare XML content as SecretString
Desclare the string parameter holding unattend.xml as secret to avoid logging it.

Signed-off-by: Christian Lindig [email protected]

Conflicts:

  • ocaml/idl/datamodel_vm.ml
  • ocaml/xapi/vm_sysprep.mli
  • ocaml/xapi/xapi_vm.mli

Desclare the string parameter holding unattend.xml as secret to avoid
logging it.

Signed-off-by: Christian Lindig <[email protected]>

# Conflicts:
#	ocaml/idl/datamodel_vm.ml
#	ocaml/xapi/vm_sysprep.mli
#	ocaml/xapi/xapi_vm.mli
@kc284 kc284 requested a review from lindig August 28, 2025 15:25
@lindig
Copy link
Contributor

lindig commented Aug 28, 2025

Mabe I should test this manually before we merge this?

Copy link
Contributor

@lindig lindig left a comment

Choose a reason for hiding this comment

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

Gave this a quick manual test. This only changes the internal representation and does not change the behaviour.

@robhoes robhoes added this pull request to the merge queue Aug 29, 2025
Merged via the queue into xapi-project:master with commit 4f80ccf Aug 29, 2025
16 checks passed
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.

3 participants