This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
Add logged-on User details to the Monitor and Destination #255
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package com.amazon.opendistroforelasticsearch.alerting.model | ||
|
|
||
|
|
||
| import org.elasticsearch.common.io.stream.StreamInput | ||
| import org.elasticsearch.common.io.stream.StreamOutput | ||
| import org.elasticsearch.common.io.stream.Writeable | ||
| import org.elasticsearch.common.xcontent.ToXContent | ||
| import org.elasticsearch.common.xcontent.ToXContentObject | ||
| import org.elasticsearch.common.xcontent.XContentBuilder | ||
| import org.elasticsearch.common.xcontent.XContentParser | ||
| import org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken | ||
| import java.io.IOException | ||
|
|
||
| data class User( | ||
|
There was a problem hiding this comment. I was under the impression we wanted to decouple the There was a problem hiding this comment. Having name, roles, backend_roles as user (sub) object is much clean. Checks are simpler. |
||
| val name: String, | ||
| val backendRoles: List<String>, | ||
| val roles: List<String>, | ||
| val customAttNames: List<String> | ||
| ) : Writeable, ToXContentObject { | ||
|
|
||
| @Throws(IOException::class) | ||
| constructor(sin: StreamInput): this( | ||
| sin.readString(), // name | ||
|
There was a problem hiding this comment. nit: I prefer using the named arguments instead of comments @Throws(IOException::class)
constructor(sin: StreamInput): this(
name = sin.readString(),
backendRoles = sin.readStringList(),
roles = sin.readStringList(),
customAttNames = sin.readStringList()
)There was a problem hiding this comment. +1. Still kotlin newbie |
||
| sin.readStringList(), // backendRoles | ||
| sin.readStringList(), // roles | ||
| sin.readStringList() // customAttNames | ||
| ) | ||
|
|
||
| override fun toXContent(builder: XContentBuilder, params: ToXContent.Params): XContentBuilder { | ||
| builder.startObject() | ||
| .field(NAME_FIELD, name) | ||
| .field(BACKEND_ROLES_FIELD, backendRoles) | ||
| .field(ROLES_FIELD, roles) | ||
| .field(CUSTOM_ATTRIBUTE_NAMES_FIELD, customAttNames) | ||
| return builder.endObject() | ||
| } | ||
| @Throws(IOException::class) | ||
| override fun writeTo(out: StreamOutput) { | ||
| out.writeString(name) | ||
| out.writeStringCollection(backendRoles) | ||
| out.writeStringCollection(roles) | ||
| out.writeStringCollection(customAttNames) | ||
| } | ||
|
|
||
| companion object { | ||
| const val NAME_FIELD = "name" | ||
| const val BACKEND_ROLES_FIELD = "backend_roles" | ||
| const val ROLES_FIELD = "roles" | ||
| const val CUSTOM_ATTRIBUTE_NAMES_FIELD = "custom_attribute_names" | ||
|
|
||
| @JvmStatic | ||
| @Throws(IOException::class) | ||
| fun parse(xcp: XContentParser): User { | ||
| var name = "" | ||
| val backendRoles: MutableList<String> = mutableListOf() | ||
| val roles: MutableList<String> = mutableListOf() | ||
| val customAttNames: MutableList<String> = mutableListOf() | ||
|
|
||
| while (xcp.nextToken() != XContentParser.Token.END_OBJECT) { | ||
| val fieldName = xcp.currentName() | ||
| xcp.nextToken() | ||
| when (fieldName) { | ||
| NAME_FIELD -> name = xcp.text() | ||
| ROLES_FIELD -> { | ||
| ensureExpectedToken(XContentParser.Token.START_ARRAY, xcp.currentToken(), xcp::getTokenLocation) | ||
| while (xcp.nextToken() != XContentParser.Token.END_ARRAY) { | ||
| roles.add(xcp.text()) | ||
| } | ||
| } | ||
| BACKEND_ROLES_FIELD -> { | ||
| ensureExpectedToken(XContentParser.Token.START_ARRAY, xcp.currentToken(), xcp::getTokenLocation) | ||
| while (xcp.nextToken() != XContentParser.Token.END_ARRAY) { | ||
| backendRoles.add(xcp.text()) | ||
| } | ||
| } | ||
| CUSTOM_ATTRIBUTE_NAMES_FIELD -> { | ||
| ensureExpectedToken(XContentParser.Token.START_ARRAY, xcp.currentToken(), xcp::getTokenLocation) | ||
| while (xcp.nextToken() != XContentParser.Token.END_ARRAY) { | ||
| customAttNames.add(xcp.text()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return User(name, backendRoles, roles, customAttNames) | ||
|
There was a problem hiding this comment. Do we want any validation of the values here? Or is a |
||
| } | ||
|
|
||
| @JvmStatic | ||
| @Throws(IOException::class) | ||
| fun readFrom(sin: StreamInput): User { | ||
|
There was a problem hiding this comment. Function seems redundant if you can just call User(sin) instead. |
||
| return User(sin) | ||
| } | ||
| } | ||
| } | ||
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
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
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
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
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
Oops, something went wrong.
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.
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 cleaner?
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.
like it 👍