resource/aws_iot_policy: Switch old version pruning to use VersionId …

…instead of CreateDate
Octogonapus · Jul 30, 2019 · 5d528f6 · 5d528f6
1 parent 9852ae0
commit 5d528f6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/aws/resource_aws_iot_policy.go b/aws/resource_aws_iot_policy.go
@@ -3,6 +3,7 @@ package aws
 import (
 	"fmt"
 	"log"
+	"strconv"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/iot"
@@ -147,14 +148,22 @@ func iotPolicyPruneVersions(name string, iotconn *iot.IoT) error {
 	}
 
 	var oldestVersion *iot.PolicyVersion
+	var oldestVersionId int64
 
 	for _, version := range versions {
 		if *version.IsDefaultVersion {
 			continue
 		}
-		if oldestVersion == nil ||
-			version.CreateDate.Before(*oldestVersion.CreateDate) {
+
+		versionId, err := strconv.ParseInt(*version.VersionId, 10, 64)
+		if err != nil {
+			log.Printf("[ERROR] Unexpected version id cannot be parsed to an integer. %s", err)
+			return err
+		}
+
+		if oldestVersion == nil || versionId < oldestVersionId {
 			oldestVersion = version
+			oldestVersionId = versionId
 		}
 	}
 

diff --git a/aws/resource_aws_iot_policy_test.go b/aws/resource_aws_iot_policy_test.go
@@ -52,7 +52,7 @@ func TestAccAWSIoTPolicy_invalidJson(t *testing.T) {
 
 func TestAccAWSIoTPolicy_update(t *testing.T) {
 	rName := acctest.RandomWithPrefix("PubSubToAnyTopic-")
-	expectedVersions := []string{"1", "2", "3", "5", "6"}
+	expectedVersions := []string{"2", "3", "4", "5", "6"}
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },