-
Notifications
You must be signed in to change notification settings - Fork 809
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(webhooks): addresses issue 3450 - introduce a delay before pollin…
…g wehook Add additional parameters to the monitored webhook to allow: 1. waiting some number of seconds before polling starts 2. retrying on specific HTTP status codes Still needs deck counterpart see [3450](spinnaker/spinnaker#3450)
- Loading branch information
1 parent
02ab2a1
commit 4b589c9
Showing
5 changed files
with
175 additions
and
41 deletions.
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
71 changes: 71 additions & 0 deletions
71
...bhook/src/test/groovy/com/netflix/spinnaker/orca/webhook/pipeline/WebhookStageSpec.groovy
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,71 @@ | ||
/* | ||
* Copyright 2019 Netflix, Inc. | ||
* | ||
* 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.webhook.pipeline | ||
|
||
import com.netflix.spinnaker.orca.pipeline.TaskNode | ||
import com.netflix.spinnaker.orca.pipeline.model.Execution | ||
import com.netflix.spinnaker.orca.pipeline.model.Stage | ||
import com.netflix.spinnaker.orca.pipeline.tasks.WaitTask | ||
import com.netflix.spinnaker.orca.webhook.tasks.CreateWebhookTask | ||
import com.netflix.spinnaker.orca.webhook.tasks.MonitorWebhookTask | ||
import spock.lang.Specification | ||
import spock.lang.Subject | ||
import spock.lang.Unroll | ||
|
||
class WebhookStageSpec extends Specification { | ||
|
||
def builder = Mock(TaskNode.Builder) | ||
|
||
@Subject | ||
webhookStage = new WebhookStage() | ||
|
||
@Unroll | ||
def "Should create correct tasks"() { | ||
given: | ||
def stage = new Stage( | ||
Execution.newPipeline("orca"), | ||
"webhook", | ||
[ | ||
waitForCompletion: waitForCompletion, | ||
waitBeforeMonitor: waitTime | ||
]) | ||
|
||
when: | ||
webhookStage.taskGraph(stage, builder) | ||
|
||
then: | ||
1 * builder.withTask("createWebhook", CreateWebhookTask) | ||
|
||
then: | ||
expectedWaitTaskCount * builder.withTask("waitBeforeMonitorWebhook", WaitTask) | ||
|
||
then: | ||
expectedMonitorTaskCount * builder.withTask("monitorWebhook", MonitorWebhookTask) | ||
|
||
stage.context.waitTime == expectedWaitTimeInContext | ||
|
||
where: | ||
waitForCompletion | waitTime || expectedWaitTimeInContext | expectedWaitTaskCount | expectedMonitorTaskCount | ||
true | 10 || 10 | 1 | 1 | ||
true | "2" || 2 | 1 | 1 | ||
"true" | 0 || null | 0 | 1 | ||
true | -1 || null | 0 | 1 | ||
false | 10 || null | 0 | 0 | ||
false | 0 || null | 0 | 0 | ||
} | ||
|
||
} |
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