APP-15731 - Support rule labels #219
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jzolo22
commented
Oct 22, 2024
|
Note to self: tag before merge |
karsonkalt
reviewed
Oct 23, 2024
| transfer_encoding: [] | ||
| trailer: {} | ||
| host: graphql.us.jupiterone.io | ||
| remote_addr: "" | ||
| request_uri: "" | ||
| body: '{"query":"\nmutation CreateInlineQuestionRuleInstance ($instance: CreateInlineQuestionRuleInstanceInput!) {\n\tcreateQuestionRuleInstance: createInlineQuestionRuleInstance(instance: $instance) {\n\t\tid\n\t\tversion\n\t\tspecVersion\n\t\tquestion {\n\t\t\tqueries {\n\t\t\t\tname\n\t\t\t\tquery\n\t\t\t\tversion\n\t\t\t\tincludeDeleted\n\t\t\t}\n\t\t}\n\t\toperations {\n\t\t\twhen\n\t\t\tactions\n\t\t}\n\t}\n}\n","variables":{"instance":{"question":{"queries":[{"query":"Find DataStore with classification=(''critical'' or ''sensitive'' or ''confidential'' or ''restricted'') and encrypted!=true","name":"query0","version":"v1","includeDeleted":false}]},"templates":null,"tags":["tf_acc:1","tf_acc:2"],"name":"tf-provider-test-rule","description":"test","specVersion":1,"operations":[],"outputs":["queries.query0.total","alertLevel"],"pollingInterval":"ONE_DAY","notifyOnFailure":false,"triggerActionsOnNewEntitiesOnly":false,"ignorePreviousResults":false,"remediationSteps":"","j1Internal":false}},"operationName":"CreateInlineQuestionRuleInstance"}' | ||
| body: '{"query":"\nmutation CreateInlineQuestionRuleInstance ($instance: CreateInlineQuestionRuleInstanceInput!) {\n\tcreateQuestionRuleInstance: createInlineQuestionRuleInstance(instance: $instance) {\n\t\tid\n\t\tversion\n\t\tspecVersion\n\t\tquestion {\n\t\t\tqueries {\n\t\t\t\tname\n\t\t\t\tquery\n\t\t\t\tversion\n\t\t\t\tincludeDeleted\n\t\t\t}\n\t\t}\n\t\toperations {\n\t\t\twhen\n\t\t\tactions\n\t\t}\n\t\tlabels {\n\t\t\tlabelName\n\t\t\tlabelValue\n\t\t}\n\t}\n}\n","variables":{"instance":{"question":{"queries":[{"query":"Find DataStore with classification=(''critical'' or ''sensitive'' or ''confidential'' or ''restricted'') and encrypted!=true","name":"query0","version":"v1","includeDeleted":false}]},"templates":null,"tags":["tf_acc:1","tf_acc:2"],"name":"tf-provider-test-rule","description":"test","specVersion":1,"operations":[],"outputs":["queries.query0.total","alertLevel"],"pollingInterval":"ONE_DAY","notifyOnFailure":false,"triggerActionsOnNewEntitiesOnly":false,"ignorePreviousResults":false,"remediationSteps":"","collectionId":"","labels":null,"j1Internal":false}},"operationName":"CreateInlineQuestionRuleInstance"}' |
There was a problem hiding this comment.
I think you can use a pipe for multi-line blocks in yaml to make this more readable
{
"query": "\nmutation CreateInlineQuestionRuleInstance ($instance: CreateInlineQuestionRuleInstanceInput!) {\n createQuestionRuleInstance: createInlineQuestionRuleInstance(instance: $instance) {\n id\n version\n specVersion\n question {\n queries {\n name\n query\n version\n includeDeleted\n }\n }\n operations {\n when\n actions\n }\n labels {\n labelName\n labelValue\n }\n }\n}\n",
"variables": {
"instance": {
"question": {
"queries": [
{
"query": "Find DataStore with classification=('critical' or 'sensitive' or 'confidential' or 'restricted') and encrypted!=true",
"name": "query0",
"version": "v1",
"includeDeleted": false
}
]
},
"templates": null,
"tags": ["tf_acc:1", "tf_acc:2"],
"name": "tf-provider-test-rule",
"description": "test",
"specVersion": 1,
"operations": [],
"outputs": ["queries.query0.total", "alertLevel"],
"pollingInterval": "ONE_DAY",
"notifyOnFailure": false,
"triggerActionsOnNewEntitiesOnly": false,
"ignorePreviousResults": false,
"remediationSteps": "",
"collectionId": "",
"labels": null,
"j1Internal": false
}
},
"operationName": "CreateInlineQuestionRuleInstance"
}
hesto2
reviewed
Oct 23, 2024
| for i, label := range r.Labels { | ||
| labels[i] = client.RuleInstanceLabelInput{ | ||
| LabelName: label.LabelName.ValueString(), | ||
| LabelValue: label.LabelValue.ValueString(), |
There was a problem hiding this comment.
Will this incorrectly convert things to a string if they are an int or a bool?
There was a problem hiding this comment.
We will only support strings in the terraform and do parsing if needed on the rule-service side. Terraform will actually throw an error if it receives anything but a string
karsonkalt
reviewed
Oct 23, 2024
| for i, label := range r.Labels { | ||
| labels[i] = client.RuleInstanceLabelInput{ | ||
| LabelName: label.LabelName.ValueString(), | ||
| LabelValue: label.LabelValue.ValueString(), |
hesto2
approved these changes
Oct 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We are using a "Primitive" gql type for the value of labelValue - this gets translated to a type of string when the client is generated. Users will use strings for the values and rule-service will parse them into their respective primitive types if needed (PR: https://github.com/JupiterOne/rule-service/pull/556).
Note: I am not adding labels to the questionRuleInstance query because the primitive label values will be returned not as strings and terraform loses its mind.