Merge pull request #250 from rawmind0/rke117

Update rke to 1.1.7 and fix

Author: rawmind0

CHANGELOG.md

@@ -1,16 +1,17 @@
-## 1.1.2 (Unreleased)
+## 1.1.2 (September 18, 2020)
 
 FEATURES:
 
 
 
 ENHANCEMENTS:
 
-
+* Updated RKE to v1.1.7
 
 BUG FIXES:
 
 * Ordering `rancher2_cluster.certificates` to avoid output diff on tf 0.13
+* Fix provider crash if `rke_state` and `rke_cluster_yaml` are not consistent about nodes count
 
 ## 1.1.1 (August 28, 2020)
 

GNUmakefile

@@ -41,7 +41,7 @@ testacc:
 
 vet:
 	@echo "==> Checking that code complies with go vet requirements..."
-	@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
+	@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -gt 0 ]; then \
 		echo ""; \
 		echo "Vet found suspicious constructs. Please check the reported constructs"; \
 		echo "and fix them if necessary before submitting the code for review."; \

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/gorilla/websocket v1.4.1 // indirect
 	github.com/hashicorp/go-version v1.2.0
 	github.com/hashicorp/terraform-plugin-sdk v1.14.0
-	github.com/rancher/rke v1.1.6
+	github.com/rancher/rke v1.1.7
 	github.com/rancher/types v0.0.0-20200812201428-42b3abe8e39e
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
 	github.com/sirupsen/logrus v1.4.2

go.sum

@@ -770,6 +770,8 @@ github.com/rancher/rke v1.1.4 h1:s9hhk0RaGRiySpBhMDx6TsTYMbAaD9QrtFKCSzTpL7Y=
 github.com/rancher/rke v1.1.4/go.mod h1:6ILvhMXD6PpjYYOvsfb4tBKN19TwhOEc3KKiKNVFcXA=
 github.com/rancher/rke v1.1.6 h1:+Ms9zGQOz8Wkx+s2x2ojucQ6NvxNr6CZ8UcPRwgTcwk=
 github.com/rancher/rke v1.1.6/go.mod h1:ixdG4yOKf6yJxmj/wqHJniMHOgParBzS1cQ9u3Mq4no=
+github.com/rancher/rke v1.1.7 h1:2kAvbzVUmr4f3CB81NvG44O2kXMEhKHvxLYnm56NMlI=
+github.com/rancher/rke v1.1.7/go.mod h1:ixdG4yOKf6yJxmj/wqHJniMHOgParBzS1cQ9u3Mq4no=
 github.com/rancher/types v0.0.0-20200303162837-300a04e6f743/go.mod h1:k5LoTlUpefw0eAzFSJsZI0gf+C4WE41yrc1jm/MS1nM=
 github.com/rancher/types v0.0.0-20200326224903-b4612bd96d9b h1:nLJOQuk36vCXFQuD03L5Fh9xpF9n9U7/76WNGDjOjeY=
 github.com/rancher/types v0.0.0-20200326224903-b4612bd96d9b/go.mod h1:k5LoTlUpefw0eAzFSJsZI0gf+C4WE41yrc1jm/MS1nM=

rke/structure_rke_cluster_node.go

@@ -61,11 +61,16 @@ func flattenRKEClusterNodes(input []rancher.RKEConfigNode, p []interface{}) []in
 			}
 		}
 	}
-	sortedInput := make([]rancher.RKEConfigNode, len(input))
+	pLen := len(p)
+	inputLen := len(input)
+	sortedInput := make([]rancher.RKEConfigNode, inputLen)
 	newNodes := []rancher.RKEConfigNode{}
 	lastIndex := 0
 	for i := range sortedInput {
 		if v, ok := pIndexAddress[input[i].Address]; ok {
+			if v > i && pLen > inputLen {
+				v = v - (v - i)
+			}
 			sortedInput[v] = input[i]
 			lastIndex++
 			continue