feat(pipeline executions/orca) : Added ability to add roles to manual… #3983
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,50 @@ | ||
| /* | ||
|
There was a problem hiding this comment. Convert to Java: We don't accept new files in |
||
| * Copyright 2020 Netflix, Inc. | ||
|
There was a problem hiding this comment. Should probably update this new file's copyright such that it reflects OpsMx's legal name instead of Netflix. |
||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License 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.netflix.spinnaker.orca.echo.util | ||
|
|
||
| import com.netflix.spinnaker.fiat.model.Authorization; | ||
|
|
||
| public class ManualJudgmentAuthzGroupsUtil { | ||
|
|
||
| public static boolean checkAuthorizedGroups(def userRoles, def stageRoles, | ||
| def permissions) { | ||
|
|
||
| def isAuthorizedGroup = false | ||
| if (!stageRoles) { | ||
| return true | ||
| } | ||
| for (role in userRoles) { | ||
| if (stageRoles.contains(role)) { | ||
| for (perm in permissions) { | ||
| def permKey = perm.getKey() | ||
| if (Authorization.CREATE.name().equals(permKey) || | ||
| Authorization.EXECUTE.name().equals(permKey) || | ||
| Authorization.WRITE.name().equals(permKey)) { | ||
| if (perm.getValue() && perm.getValue().contains(role)) { | ||
| return true | ||
| } | ||
| } else if (Authorization.READ.name().equals(permKey)) { | ||
| if (perm.getValue() && perm.getValue().contains(role)) { | ||
| isAuthorizedGroup = false | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return isAuthorizedGroup | ||
| } | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -16,6 +16,9 @@ | |
|
|
||
| package com.netflix.spinnaker.orca.echo.pipeline | ||
|
|
||
| import com.netflix.spinnaker.fiat.model.UserPermission | ||
| import com.netflix.spinnaker.fiat.model.resources.Role | ||
| import com.netflix.spinnaker.fiat.shared.FiatPermissionEvaluator | ||
| import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus | ||
| import com.netflix.spinnaker.orca.api.pipeline.models.StageExecution | ||
| import com.netflix.spinnaker.orca.echo.EchoService | ||
|
|
@@ -27,6 +30,11 @@ import static com.netflix.spinnaker.orca.echo.pipeline.ManualJudgmentStage.Notif | |
| import static com.netflix.spinnaker.orca.echo.pipeline.ManualJudgmentStage.WaitForManualJudgmentTask | ||
|
|
||
| class ManualJudgmentStageSpec extends Specification { | ||
|
|
||
| EchoService echoService = Mock(EchoService) | ||
|
|
||
| FiatPermissionEvaluator fpe = Mock(FiatPermissionEvaluator) | ||
|
|
||
| @Unroll | ||
| void "should return execution status based on judgmentStatus"() { | ||
| given: | ||
|
|
@@ -42,16 +50,46 @@ class ManualJudgmentStageSpec extends Specification { | |
| where: | ||
| context || expectedStatus | ||
| [:] || ExecutionStatus.RUNNING | ||
| [judgmentStatus: "continue", isAuthorized: true] || ExecutionStatus.SUCCEEDED | ||
| [judgmentStatus: "Continue", isAuthorized: true] || ExecutionStatus.SUCCEEDED | ||
| [judgmentStatus: "stop", isAuthorized: true] || ExecutionStatus.TERMINAL | ||
| [judgmentStatus: "STOP", isAuthorized: true] || ExecutionStatus.TERMINAL | ||
| [judgmentStatus: "unknown", isAuthorized: true] || ExecutionStatus.RUNNING | ||
| } | ||
|
|
||
| @Unroll | ||
| void "should return execution status based on authorizedGroups"() { | ||
| given: | ||
| def task = new WaitForManualJudgmentTask(Optional.of(fpe)) | ||
|
|
||
| when: | ||
| def result = task.execute(new StageExecutionImpl(PipelineExecutionImpl.newPipeline("orca"), "", context)) | ||
|
|
||
| then: | ||
| 1 * fpe.getPermission('[email protected]') >> { | ||
| new UserPermission().addResources([new Role('foo'), new Role('baz')]).view | ||
| } | ||
| result.status == expectedStatus | ||
|
|
||
| where: | ||
| context || expectedStatus | ||
| [judgmentStatus: "continue", isAuthorized: false, username: "[email protected]", | ||
| stageRoles: "foo", permissions: [WRITE: "foo",READ: "foo",READ: "baz"]] || ExecutionStatus.SUCCEEDED | ||
| [judgmentStatus: "Continue", isAuthorized: false, username: "[email protected]", | ||
| stageRoles: "foo", permissions: [WRITE: "foo",READ: "foo",READ: "baz"]] || ExecutionStatus.SUCCEEDED | ||
| [judgmentStatus: "stop", isAuthorized: false, username: "[email protected]", | ||
| stageRoles: "foo", permissions: [WRITE: "foo",READ: "foo",READ: "baz"]] || ExecutionStatus.TERMINAL | ||
| [judgmentStatus: "STOP", isAuthorized: false, username: "[email protected]", | ||
| stageRoles: "foo", permissions: [WRITE: "foo",READ: "foo",READ: "baz"]] || ExecutionStatus.TERMINAL | ||
| [judgmentStatus: "Continue", isAuthorized: false, username: "[email protected]", | ||
| stageRoles: "baz", permissions: [WRITE: "foo",READ: "foo",READ: "baz"]] || ExecutionStatus.RUNNING | ||
| [judgmentStatus: "Stop", isAuthorized: false, username: "[email protected]", | ||
| stageRoles: "baz", permissions: [WRITE: "foo",READ: "foo",READ: "baz"]] || ExecutionStatus.RUNNING | ||
| } | ||
|
|
||
| void "should only send notifications for supported types"() { | ||
| given: | ||
| def task = new WaitForManualJudgmentTask(Optional.of(echoService), Optional.of(fpe)) | ||
|
|
||
| when: | ||
| def result = task.execute(new StageExecutionImpl(PipelineExecutionImpl.newPipeline("orca"), "", [notifications: [ | ||
|
|
@@ -72,14 +110,15 @@ class ManualJudgmentStageSpec extends Specification { | |
| @Unroll | ||
| void "if deprecated notification configuration is in use, only send notifications for awaiting judgment state"() { | ||
| given: | ||
| def task = new WaitForManualJudgmentTask(Optional.of(echoService), Optional.of(fpe)) | ||
|
|
||
| when: | ||
| def result = task.execute(new StageExecutionImpl(PipelineExecutionImpl.newPipeline("orca"), "", [ | ||
| sendNotifications: sendNotifications, | ||
| notifications: [ | ||
| new Notification(type: "email", address: "[email protected]", when: [ notificationState ]) | ||
| ], | ||
| isAuthorized: true, | ||
| judgmentStatus: judgmentStatus | ||
| ])) | ||
|
|
||
|
|
@@ -153,7 +192,7 @@ class ManualJudgmentStageSpec extends Specification { | |
| @Unroll | ||
| void "should retain unknown fields in the notification context"() { | ||
| given: | ||
| def task = new WaitForManualJudgmentTask(Optional.of(echoService), Optional.of(fpe)) | ||
|
|
||
| def slackNotification = new Notification(type: "slack") | ||
| slackNotification.setOther("customMessage", "hello slack") | ||
|
|
||
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
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.
Remove both. Neither of these constructors are necessary and would cause issues when doing dependency injection because none of them are annotated with
@Autowired.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.
done