11package aws
22
33import (
4+ "context"
5+ "errors"
46 "log"
57 "os"
6- "strconv"
78 "time"
89
9- "github.com/aws/aws-sdk-go/aws"
10- "github.com/aws/aws-sdk-go/aws/awserr"
11- "github.com/aws/aws-sdk-go/service/dynamodb"
12- "github.com/aws/aws-sdk-go/service/dynamodb/expression"
10+ "github.com/aws/aws-sdk-go-v2/aws"
11+ "github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue"
12+ "github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression"
13+
14+ "github.com/aws/aws-sdk-go-v2/service/dynamodb"
15+ "github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
16+
17+ "github.com/aws/smithy-go"
1318)
1419
1520const (
@@ -20,30 +25,27 @@ const (
2025)
2126
2227type DynamoDbLock struct {
23- DynamoDb * dynamodb.DynamoDB
28+ DynamoDb * dynamodb.Client
2429}
2530
2631func isResourceNotFoundExceptionError (err error ) bool {
2732 if err != nil {
28- aerr , ok := err .(awserr.Error )
29- if ! ok {
30- // not aws error
31- return false
32- }
33-
34- if aerr .Code () == dynamodb .ErrCodeResourceNotFoundException {
35- // ErrCodeResourceNotFoundException code
36- return true
33+ var apiError smithy.APIError
34+ if errors .As (err , & apiError ) {
35+ switch apiError .(type ) {
36+ case * types.ResourceNotFoundException :
37+ return true
38+ }
3739 }
3840 }
3941 return false
4042}
4143
42- func (dynamoDbLock * DynamoDbLock ) waitUntilTableCreated () error {
44+ func (dynamoDbLock * DynamoDbLock ) waitUntilTableCreated (ctx context. Context ) error {
4345 input := & dynamodb.DescribeTableInput {
4446 TableName : aws .String (TABLE_NAME ),
4547 }
46- status , err := dynamoDbLock .DynamoDb .DescribeTable (input )
48+ status , err := dynamoDbLock .DynamoDb .DescribeTable (ctx , input )
4749 cnt := 0
4850
4951 if err != nil {
@@ -52,9 +54,9 @@ func (dynamoDbLock *DynamoDbLock) waitUntilTableCreated() error {
5254 }
5355 }
5456
55- for * status .Table .TableStatus != "ACTIVE" {
57+ for status .Table .TableStatus != "ACTIVE" {
5658 time .Sleep (TableCreationInterval )
57- status , err = dynamoDbLock .DynamoDb .DescribeTable (input )
59+ status , err = dynamoDbLock .DynamoDb .DescribeTable (ctx , input )
5860 if err != nil {
5961 if ! isResourceNotFoundExceptionError (err ) {
6062 return err
@@ -72,8 +74,8 @@ func (dynamoDbLock *DynamoDbLock) waitUntilTableCreated() error {
7274}
7375
7476// TODO: refactor func to return actual error and fail on callers
75- func (dynamoDbLock * DynamoDbLock ) createTableIfNotExists () error {
76- _ , err := dynamoDbLock .DynamoDb .DescribeTable (& dynamodb.DescribeTableInput {
77+ func (dynamoDbLock * DynamoDbLock ) createTableIfNotExists (ctx context. Context ) error {
78+ _ , err := dynamoDbLock .DynamoDb .DescribeTable (ctx , & dynamodb.DescribeTableInput {
7779 TableName : aws .String (TABLE_NAME ),
7880 })
7981
@@ -84,38 +86,39 @@ func (dynamoDbLock *DynamoDbLock) createTableIfNotExists() error {
8486 }
8587
8688 createtbl_input := & dynamodb.CreateTableInput {
87- AttributeDefinitions : []* dynamodb.AttributeDefinition {
89+
90+ AttributeDefinitions : []types.AttributeDefinition {
8891 {
8992 AttributeName : aws .String ("PK" ),
90- AttributeType : aws . String ( "S" ) ,
93+ AttributeType : types . ScalarAttributeTypeS ,
9194 },
9295 {
9396 AttributeName : aws .String ("SK" ),
94- AttributeType : aws . String ( "S" ) ,
97+ AttributeType : types . ScalarAttributeTypeS ,
9598 },
9699 },
97- KeySchema : []* dynamodb .KeySchemaElement {
100+ KeySchema : []types .KeySchemaElement {
98101 {
99102 AttributeName : aws .String ("PK" ),
100- KeyType : aws . String ( "HASH" ) ,
103+ KeyType : types . KeyTypeHash ,
101104 },
102105 {
103106 AttributeName : aws .String ("SK" ),
104- KeyType : aws . String ( "RANGE" ) ,
107+ KeyType : types . KeyTypeRange ,
105108 },
106109 },
107- BillingMode : aws . String ( "PAY_PER_REQUEST" ) ,
110+ BillingMode : types . BillingModePayPerRequest ,
108111 TableName : aws .String (TABLE_NAME ),
109112 }
110- _ , err = dynamoDbLock .DynamoDb .CreateTable (createtbl_input )
113+ _ , err = dynamoDbLock .DynamoDb .CreateTable (ctx , createtbl_input )
111114 if err != nil {
112115 if os .Getenv ("DEBUG" ) != "" {
113116 log .Printf ("%v\n " , err )
114117 }
115118 return err
116119 }
117120
118- err = dynamoDbLock .waitUntilTableCreated ()
121+ err = dynamoDbLock .waitUntilTableCreated (ctx )
119122 if err != nil {
120123 log .Printf ("%v\n " , err )
121124 return err
@@ -125,7 +128,8 @@ func (dynamoDbLock *DynamoDbLock) createTableIfNotExists() error {
125128}
126129
127130func (dynamoDbLock * DynamoDbLock ) Lock (transactionId int , resource string ) (bool , error ) {
128- dynamoDbLock .createTableIfNotExists ()
131+ ctx := context .Background ()
132+ dynamoDbLock .createTableIfNotExists (ctx )
129133 // TODO: remove timeout completely
130134 now := time .Now ().Format (time .RFC3339 )
131135 newTimeout := time .Now ().Add (TableLockTimeout ).Format (time .RFC3339 )
@@ -143,24 +147,28 @@ func (dynamoDbLock *DynamoDbLock) Lock(transactionId int, resource string) (bool
143147 ).Set (expression .Name ("timeout" ), expression .Value (newTimeout )),
144148 ).
145149 Build ()
146-
147150 if err != nil {
148151 return false , err
149152 }
150153
151154 input := & dynamodb.UpdateItemInput {
152- TableName : aws .String (TABLE_NAME ),
153- Key : map [string ]* dynamodb.AttributeValue {"PK" : {S : aws .String ("LOCK" )}, "SK" : {S : aws .String ("RES#" + resource )}},
155+ TableName : aws .String (TABLE_NAME ),
156+ Key : map [string ]types.AttributeValue {
157+ "PK" : & types.AttributeValueMemberS {Value : "LOCK" },
158+ "SK" : & types.AttributeValueMemberS {Value : "RES#" + resource },
159+ },
154160 ConditionExpression : expr .Condition (),
155161 ExpressionAttributeNames : expr .Names (),
156162 ExpressionAttributeValues : expr .Values (),
157163 UpdateExpression : expr .Update (),
158164 }
159165
160- _ , err = dynamoDbLock .DynamoDb .UpdateItem (input )
166+ _ , err = dynamoDbLock .DynamoDb .UpdateItem (ctx , input )
161167 if err != nil {
162- if aerr , ok := err .(awserr.Error ); ok {
163- if aerr .Code () == dynamodb .ErrCodeConditionalCheckFailedException {
168+ var apiError smithy.APIError
169+ if errors .As (err , & apiError ) {
170+ switch apiError .(type ) {
171+ case * types.ConditionalCheckFailedException :
164172 return false , nil
165173 }
166174 }
@@ -171,36 +179,50 @@ func (dynamoDbLock *DynamoDbLock) Lock(transactionId int, resource string) (bool
171179}
172180
173181func (dynamoDbLock * DynamoDbLock ) Unlock (resource string ) (bool , error ) {
174- dynamoDbLock .createTableIfNotExists ()
182+ ctx := context .Background ()
183+ dynamoDbLock .createTableIfNotExists (ctx )
175184 input := & dynamodb.DeleteItemInput {
176185 TableName : aws .String (TABLE_NAME ),
177- Key : map [string ]* dynamodb.AttributeValue {"PK" : {S : aws .String ("LOCK" )}, "SK" : {S : aws .String ("RES#" + resource )}},
186+ Key : map [string ]types.AttributeValue {
187+ "PK" : & types.AttributeValueMemberS {Value : "LOCK" },
188+ "SK" : & types.AttributeValueMemberS {Value : "RES#" + resource },
189+ },
178190 }
179191
180- _ , err := dynamoDbLock .DynamoDb .DeleteItem (input )
192+ _ , err := dynamoDbLock .DynamoDb .DeleteItem (ctx , input )
181193 if err != nil {
182194 return false , err
183195 }
184196 return true , nil
185197}
186198
187199func (dynamoDbLock * DynamoDbLock ) GetLock (lockId string ) (* int , error ) {
188- dynamoDbLock .createTableIfNotExists ()
200+ ctx := context .Background ()
201+ dynamoDbLock .createTableIfNotExists (ctx )
189202 input := & dynamodb.GetItemInput {
190203 TableName : aws .String (TABLE_NAME ),
191- Key : map [string ]* dynamodb.AttributeValue {"PK" : {S : aws .String ("LOCK" )}, "SK" : {S : aws .String ("RES#" + lockId )}},
204+ Key : map [string ]types.AttributeValue {
205+ "PK" : & types.AttributeValueMemberS {Value : "LOCK" },
206+ "SK" : & types.AttributeValueMemberS {Value : "RES#" + lockId },
207+ },
192208 }
193209
194- result , err := dynamoDbLock .DynamoDb .GetItem (input )
210+ result , err := dynamoDbLock .DynamoDb .GetItem (ctx , input )
195211 if err != nil {
196212 return nil , err
197213 }
198214
199- if result .Item != nil {
200- transactionId := result .Item ["transaction_id" ].N
201- res , err := strconv .Atoi (* transactionId )
202- return & res , err
215+ type TransactionLock struct {
216+ TransactionID int `dynamodbav:"transaction_id"`
203217 }
204218
219+ var t TransactionLock
220+ err = attributevalue .UnmarshalMap (result .Item , & t )
221+ if err != nil {
222+ return nil , err
223+ }
224+ if t .TransactionID != 0 {
225+ return & t .TransactionID , nil
226+ }
205227 return nil , nil
206228}
0 commit comments