-
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(runJob): cancel underlying job on cancel stage (#2966)
- Loading branch information
Showing
7 changed files
with
207 additions
and
4 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
85 changes: 85 additions & 0 deletions
85
...c/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/job/RunJobStageContext.java
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,85 @@ | ||
| /* | ||
| * | ||
| * 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.clouddriver.pipeline.job; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonAnyGetter; | ||
| import com.fasterxml.jackson.annotation.JsonAnySetter; | ||
| import com.fasterxml.jackson.annotation.JsonIgnore; | ||
| import com.netflix.spinnaker.orca.clouddriver.pipeline.job.model.JobStatus; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class RunJobStageContext { | ||
| private JobStatus jobStatus; | ||
| private String cloudProvider; | ||
| private String cloudProviderType; | ||
| private String application; | ||
| private String credentials; | ||
|
|
||
| @JsonIgnore private Map<String, Object> other = new HashMap<>(); | ||
|
|
||
| @JsonAnyGetter | ||
| public Map<String, Object> other() { | ||
| return other; | ||
| } | ||
|
|
||
| @JsonAnySetter | ||
| public void set(String name, Object value) { | ||
| other.put(name, value); | ||
| } | ||
|
|
||
| public JobStatus getJobStatus() { | ||
| return jobStatus; | ||
| } | ||
|
|
||
| public void setJobStatus(JobStatus jobStatus) { | ||
| this.jobStatus = jobStatus; | ||
| } | ||
|
|
||
| public String getCloudProvider() { | ||
| return cloudProvider; | ||
| } | ||
|
|
||
| public void setCloudProvider(String cloudProvider) { | ||
| this.cloudProvider = cloudProvider; | ||
| } | ||
|
|
||
| public String getCloudProviderType() { | ||
| return cloudProviderType; | ||
| } | ||
|
|
||
| public void setCloudProviderType(String cloudProviderType) { | ||
| this.cloudProviderType = cloudProviderType; | ||
| } | ||
|
|
||
| public String getApplication() { | ||
| return application; | ||
| } | ||
|
|
||
| public void setApplication(String application) { | ||
| this.application = application; | ||
| } | ||
|
|
||
| public String getCredentials() { | ||
| return credentials; | ||
| } | ||
|
|
||
| public void setCredentials(String credentials) { | ||
| this.credentials = credentials; | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
...n/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/job/model/CompletionDetails.java
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,26 @@ | ||
| /* | ||
| * | ||
| * 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.clouddriver.pipeline.job.model; | ||
|
|
||
| import lombok.Data; | ||
|
|
||
| @Data | ||
| public class CompletionDetails { | ||
| private String instanceId; | ||
| private String taskId; | ||
| } |
34 changes: 34 additions & 0 deletions
34
.../src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/job/model/JobStatus.java
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,34 @@ | ||
| /* | ||
| * | ||
| * 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.clouddriver.pipeline.job.model; | ||
|
|
||
| import lombok.Data; | ||
|
|
||
| @Data | ||
| public class JobStatus { | ||
| private String application; | ||
| private String provider; | ||
| private CompletionDetails completionDetails; | ||
| private String jobState; | ||
| private String name; | ||
| private Long createdTime; | ||
| private String id; | ||
| private String type; | ||
| private String region; | ||
| private String account; | ||
| } |
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