Fixing StageTimeoutMS (#66)

* Persisting StageTimeoutMS * Bumping version 2.2.2
jgramoll · May 26, 2020 · 947515c · 947515c
1 parent 6743b72
commit 947515c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # terraform-provider-spinnaker
 
+## 2.2.2
+
+- `2c8d5f` persist StageTimeoutMS
+
 ## 2.2.1
 
 - `2671fd` fix goreleaser archive->archives

diff --git a/README.md b/README.md
@@ -558,7 +558,7 @@ go mod vendor
 ### Link ###
 
 ```sh
-version=v2.2.1
+version=v2.2.2
 go clean
 go build
 rm ~/.terraform.d/plugins/$(uname | tr '[:upper:]' '[:lower:]')_amd64/terraform-provider-spinnaker_$version

diff --git a/provider/pipeline_stage.go b/provider/pipeline_stage.go
@@ -54,6 +54,7 @@ func (s *baseStage) baseToClientStage(cs *client.BaseStage, refID string, notifi
 	cs.FailOnFailedExpressions = s.FailOnFailedExpressions
 	cs.FailPipeline = s.FailPipeline
 	cs.OverrideTimeout = s.OverrideTimeout
+	cs.StageTimeoutMS = s.StageTimeoutMS
 	cs.RestrictExecutionDuringTimeWindow = s.RestrictExecutionDuringTimeWindow
 	cs.RestrictedExecutionWindow = toClientExecutionWindow(s.RestrictedExecutionWindow)
 	return nil
@@ -77,6 +78,7 @@ func (s *baseStage) baseFromClientStage(clientStage *client.BaseStage, notificat
 	s.FailOnFailedExpressions = clientStage.FailOnFailedExpressions
 	s.FailPipeline = clientStage.FailPipeline
 	s.OverrideTimeout = clientStage.OverrideTimeout
+	s.StageTimeoutMS = clientStage.StageTimeoutMS
 	s.RestrictExecutionDuringTimeWindow = clientStage.RestrictExecutionDuringTimeWindow
 	s.RestrictedExecutionWindow = fromClientExecutionWindow(clientStage.RestrictedExecutionWindow)
 	return nil
@@ -119,6 +121,10 @@ func (s *baseStage) baseSetResourceData(d *schema.ResourceData) error {
 	if err != nil {
 		return err
 	}
+	err = d.Set("stage_timeout_ms", s.StageTimeoutMS)
+	if err != nil {
+		return err
+	}
 	err = d.Set("restrict_execution_during_time_window", s.RestrictExecutionDuringTimeWindow)
 	if err != nil {
 		return err

diff --git a/publish b/publish
@@ -1,4 +1,4 @@
-version=v2.2.1
+version=v2.2.2
 git tag -a $version -m $version
 git push origin $version
 goreleaser release --rm-dist