-
Notifications
You must be signed in to change notification settings - Fork 148
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
Redacting nested or conditional properties #2854
Conversation
/test-extended |
🤖 pr-bot 🤖 🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/3429310300 (with refid (in response to this comment from @damoodamoo) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM % one naming comment :)
|
||
flatten_template_props(template.dict()) | ||
|
||
def recurse_input_props(prop_dict: dict): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: maybe name it recurse_mask_sensitive_props
? Or something else that hints at sensitive properties being redacted in this method
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it doesn't just recurse sensitive props though, it recurses all props, and just redacts the sensitive ones
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(it's also an inner method, inside the mask_sensitive_props
method)
api_app/_version.py
Outdated
@@ -1 +1 @@ | |||
__version__ = "0.5.12" | |||
__version__ = "0.5.13" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to revert all these formatting changes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there are actually only a handful of formatting changes where long lines have been sent to multiple lines - that's also from the VS Code "Format Document" command, so should be consistent with other developers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But now other files in the same api_app are inconsistent, not to mention the line length is really short.
You can close this but lets reformat the entire app in a dedicated PR and have the linter also check it (correctly it's disabled I think)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
think we've talked about changing the linter to check for line lengths already - let's raise again in a standup
/test-destroy-env |
Destroying branch test environment (RG: rg-tre0bbf4706)... (run: https://github.com/microsoft/AzureTRE/actions/runs/3435421517) |
Destroying PR test environment (RG: rg-tre4aa273f1)... (run: https://github.com/microsoft/AzureTRE/actions/runs/3435421517) |
Branch test environment destroy complete (RG: rg-tre0bbf4706) |
PR test environment destroy complete (RG: rg-tre4aa273f1) |
/test-extended |
🤖 pr-bot 🤖 🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/3435706765 (with refid (in response to this comment from @damoodamoo) |
/test-extended |
🤖 pr-bot 🤖 🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/3448386528 (with refid (in response to this comment from @marrobi) |
/test-destroy-env |
Destroying PR test environment (RG: rg-tre4aa273f1)... (run: https://github.com/microsoft/AzureTRE/actions/runs/3461324209) |
PR test environment destroy complete (RG: rg-tre4aa273f1) |
Destroying branch test environment (RG: rg-tre0bbf4706)... (run: https://github.com/microsoft/AzureTRE/actions/runs/3461324209) |
Branch test environment destroy complete (RG: rg-tre0bbf4706) |
/test-extended |
🤖 pr-bot 🤖 🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/3461334675 (with refid (in response to this comment from @damoodamoo) |
/test-destroy-env |
Destroying branch test environment (RG: rg-tre0bbf4706)... (run: https://github.com/microsoft/AzureTRE/actions/runs/3461739689) |
Branch test environment destroy complete (RG: rg-tre0bbf4706) |
Destroying PR test environment (RG: rg-tre4aa273f1)... (run: https://github.com/microsoft/AzureTRE/actions/runs/3461739689) |
PR test environment destroy complete (RG: rg-tre4aa273f1) |
…ureTRE into damoo/2836-redacting-nested
/test-extended |
🤖 pr-bot 🤖 🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/3464009593 (with refid (in response to this comment from @damoodamoo) |
/test-destroy-env |
killing this to try again |
Destroying PR test environment (RG: rg-tre4aa273f1)... (run: https://github.com/microsoft/AzureTRE/actions/runs/3464524708) |
Destroying branch test environment (RG: rg-tre0bbf4706)... (run: https://github.com/microsoft/AzureTRE/actions/runs/3464524708) |
Branch test environment destroy complete (RG: rg-tre0bbf4706) |
PR test environment destroy complete (RG: rg-tre4aa273f1) |
Resolves #2836
What is being addressed
Following the move on the base workspace to conditional properties via
allOf
, the client secret was no longer being redacted as it was assumed to be in the main templateproperties
and the input property was assumed to be a flat list with no nesting. This fixes that and supports conditional properties in the template as well as nested properties.