This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 45
actionify add policy API #298
Merged
bowenlan-amzn
merged 2 commits into
opendistro-for-elasticsearch:master
from
bowenlan-amzn:security-addpolicy
Oct 7, 2020
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
25 changes: 25 additions & 0 deletions
25
...search/indexmanagement/indexstatemanagement/transport/action/addpolicy/AddPolicyAction.kt
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,25 @@ | ||
| /* | ||
| * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.addpolicy | ||
|
|
||
| import org.elasticsearch.action.ActionType | ||
|
|
||
| class AddPolicyAction private constructor() : ActionType<AddPolicyResponse>(NAME, ::AddPolicyResponse) { | ||
| companion object { | ||
| val INSTANCE = AddPolicyAction() | ||
| val NAME = "cluster:admin/opendistro/ism/managedindex/add" | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
...earch/indexmanagement/indexstatemanagement/transport/action/addpolicy/AddPolicyRequest.kt
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,58 @@ | ||
| /* | ||
| * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.addpolicy | ||
|
|
||
| import org.elasticsearch.action.ActionRequest | ||
| import org.elasticsearch.action.ActionRequestValidationException | ||
| import org.elasticsearch.action.ValidateActions | ||
| import org.elasticsearch.common.io.stream.StreamInput | ||
| import org.elasticsearch.common.io.stream.StreamOutput | ||
| import java.io.IOException | ||
| import java.util.Collections | ||
|
|
||
| class AddPolicyRequest : ActionRequest { | ||
|
|
||
| val indices: List<String> | ||
| val policyID: String? | ||
|
|
||
| constructor( | ||
| indices: List<String>, | ||
| policyID: String? | ||
| ) : super() { | ||
| this.indices = indices | ||
| this.policyID = policyID | ||
| } | ||
|
|
||
| @Throws(IOException::class) | ||
| constructor(sin: StreamInput) : this( | ||
| Collections.unmodifiableList(sin.readStringList()), | ||
| sin.readString() | ||
| ) | ||
|
|
||
| override fun validate(): ActionRequestValidationException? { | ||
| var validationException: ActionRequestValidationException? = null | ||
| if (indices.isEmpty() || policyID.isNullOrBlank()) { | ||
| validationException = ValidateActions.addValidationError("Missing indices or policyID", validationException) | ||
| } | ||
| return validationException | ||
| } | ||
|
|
||
| @Throws(IOException::class) | ||
| override fun writeTo(out: StreamOutput) { | ||
| out.writeStringCollection(indices) | ||
| out.writeString(policyID) | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
...arch/indexmanagement/indexstatemanagement/transport/action/addpolicy/AddPolicyResponse.kt
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,25 @@ | ||
| /* | ||
| * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.addpolicy | ||
|
|
||
| import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.ISMStatusResponse | ||
| import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FailedIndex | ||
| import org.elasticsearch.common.io.stream.StreamInput | ||
|
|
||
| class AddPolicyResponse : ISMStatusResponse { | ||
| constructor(updated: Int, failedIndices: List<FailedIndex>) : super(updated, failedIndices) | ||
| constructor(sin: StreamInput) : super(sin) | ||
| } | ||
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.
Do we actually need a subclass when there is nothing extra being added? Any reason not to just use ISMStatusResponse?
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.
No big reason, just to look orderly, should be easier to read and understand I guess