fix:get aws leases in order (#430)

* fix:get aws leases in order * Changelog updated
Optum · Dec 22, 2022 · 7a22c7f · 7a22c7f
1 parent 25a4530
commit 7a22c7f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## next
 
+- Add new secondary index 'PrincipalIdLastModifiedOn' for Lease table with range   key as LastModifiedOn to get the records sort by last-modified 
+- Update pkg/data/leases.go queryLeases method  to use new IndexName PrincipalIdLastModifiedOn instead of existing IndexName PrincipalId in to get leases in order
+
+## v0.33.9
+
 - Upgrade to Go version 1.17
 - Upgrade Ubuntu version on Azure DevOps Agent
 - Fix Go dependency errors in pipeline

diff --git a/modules/dynamodb.tf b/modules/dynamodb.tf
@@ -87,6 +87,15 @@ resource "aws_dynamodb_table" "leases" {
     write_capacity  = var.leases_table_wcu
   }
 
+  global_secondary_index {
+    name            = "PrincipalIdLastModifiedOn"
+    hash_key        = "PrincipalId"
+    range_key       = "LastModifiedOn"
+    projection_type = "ALL"
+    read_capacity   = var.leases_table_rcu
+    write_capacity  = var.leases_table_wcu
+  }
+
   # AWS Account ID
   attribute {
     name = "AccountId"
@@ -114,6 +123,12 @@ resource "aws_dynamodb_table" "leases" {
     type = "S"
   }
 
+  # Last ModifiedOn
+  attribute {
+    name = "LastModifiedOn"
+    type = "N"
+  }
+
   tags = var.global_tags
   /*
   Other attributes:

diff --git a/pkg/data/leases.go b/pkg/data/leases.go
@@ -1,13 +1,14 @@
 package data
 
 import (
+	"strings"
+
 	"github.com/Optum/dce/pkg/errors"
 	"github.com/Optum/dce/pkg/lease"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/dynamodb"
 	"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute"
 	"github.com/aws/aws-sdk-go/service/dynamodb/expression"
-	"strings"
 )
 
 // queryLeases for doing a query against dynamodb
@@ -36,6 +37,7 @@ func (a *Lease) queryLeases(query *lease.Lease, keyName string, index string) (*
 		FilterExpression:          expr.Filter(),
 		ExpressionAttributeNames:  expr.Names(),
 		ExpressionAttributeValues: expr.Values(),
+		ScanIndexForward:          aws.Bool(false),
 	}
 
 	queryInput.SetLimit(*query.Limit)
@@ -125,7 +127,7 @@ func (a *Lease) List(query *lease.Lease) (*lease.Leases, error) {
 	if query.ID != nil {
 		outputs, err = a.queryLeases(query, "Id", "LeaseId")
 	} else if query.PrincipalID != nil {
-		outputs, err = a.queryLeases(query, "PrincipalId", "PrincipalId")
+		outputs, err = a.queryLeases(query, "PrincipalId", "PrincipalIdLastModifiedOn")
 	} else if query.Status != nil {
 		outputs, err = a.queryLeases(query, "LeaseStatus", "LeaseStatus")
 	} else {