migrate aws-sdk-go v1 to v2

backend/go.mod

@@ -66,6 +66,17 @@ require (
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/aws/aws-sdk-go v1.51.21 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.16.16 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.15.13 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.12.8 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.8 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.11.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.16.9 // indirect
+	github.com/aws/smithy-go v1.13.3 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/bmatcuk/doublestar v1.3.1 // indirect
@@ -101,7 +112,6 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-github/v35 v35.3.0 // indirect
-	github.com/google/go-github/v57 v57.0.0 // indirect
 	github.com/google/go-github/v59 v59.0.0 // indirect
 	github.com/google/go-github/v60 v60.0.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect

cli/go.mod

@@ -8,7 +8,7 @@ require (
 	cloud.google.com/go/storage v1.39.1
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2
 	github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.2.0
-	github.com/aws/aws-sdk-go v1.51.21
+	github.com/aws/aws-sdk-go v1.51.21 // indirect
 	github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
 	github.com/google/uuid v1.6.0
 	github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5
@@ -21,7 +21,12 @@ require (
 require (
 	github.com/aws/aws-sdk-go-v2 v1.26.1
 	github.com/aws/aws-sdk-go-v2/config v1.27.11
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.11
+	github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.13.13
+	github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.7.13
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.31.1
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1
+	github.com/aws/aws-sdk-go-v2/service/sts v1.28.6
 	github.com/aws/smithy-go v1.20.2
 	github.com/caarlos0/env/v8 v8.0.0
 	github.com/diggerhq/digger/libs v0.4.13
@@ -54,19 +59,19 @@ require (
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.20.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.6 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/bmatcuk/doublestar v1.3.1 // indirect

cli/go.sum

@@ -322,6 +322,10 @@ github.com/aws/aws-sdk-go-v2/config v1.27.11 h1:f47rANd2LQEYHda2ddSCKYId18/8BhSR
 github.com/aws/aws-sdk-go-v2/config v1.27.11/go.mod h1:SMsV78RIOYdve1vf36z8LmnszlRWkwMQtomCAI0/mIE=
 github.com/aws/aws-sdk-go-v2/credentials v1.17.11 h1:YuIB1dJNf1Re822rriUOTxopaHHvIq0l/pX3fwO+Tzs=
 github.com/aws/aws-sdk-go-v2/credentials v1.17.11/go.mod h1:AQtFPsDH9bI2O+71anW6EKL+NcD7LG3dpKGMV4SShgo=
+github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.13.13 h1:loQ4VSt3hTm9n8ST9jveArwmhqAc5aiRJXlxLPxCNTw=
+github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.13.13/go.mod h1:RjdeQvzJuUf9jWj+ta+7l3VnVpDZ+RmtP/p+QdwRIpI=
+github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.7.13 h1:4dTgKDA9gO1s0gdeVJh9Nid2/q9dJ2lUC0XbJqbWOUo=
+github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.7.13/go.mod h1:otybei7IbiLt2YGJRQCi7MWi6r+az3ukC9TiwRPkltw=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 h1:FVJ0r5XTHSmIHJV6KuDmdYhEpvlHpiSd38RQWhut5J4=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1/go.mod h1:zusuAeqezXzAB24LGuzuekqMAEgWkVYukBec3kr3jUg=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg=
@@ -332,10 +336,16 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 h1:81KE7vaZzrl7yHBYHVEzYB8sypz11NMOZ40YlWvPxsU=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5/go.mod h1:LIt2rg7Mcgn09Ygbdh/RdIm0rQ+3BNkbP1gyVMFtRK0=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.31.1 h1:dZXY07Dm59TxAjJcUfNMJHLDI/gLMxTRZefn2jFAVsw=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.31.1/go.mod h1:lVLqEtX+ezgtfalyJs7Peb0uv9dEpAQP5yuq2O26R44=
+github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.20.4 h1:hSwDD19/e01z3pfyx+hDeX5T/0Sn+ZEnnTO5pVWKWx8=
+github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.20.4/go.mod h1:61CuGwE7jYn0g2gl7K3qoT4vCY59ZQEixkPu8PN5IrE=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 h1:ZMeFZ5yk+Ek+jNr1+uwCd2tG89t6oTS5yVWpa6yy2es=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7/go.mod h1:mxV05U+4JiHqIpGqqYXOHLPKUC6bDXC44bsUhNjOEwY=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.6 h1:6tayEze2Y+hiL3kdnEUxSPsP+pJsUfwLSFspFl1ru9Q=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.6/go.mod h1:qVNb/9IOVsLCZh0x2lnagrBwQ9fxajUpXS7OZfIsKn0=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 h1:ogRAwT1/gxJBcSWDMZlgyFUM962F51A5CRhDLbxLdmo=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7/go.mod h1:YCsIZhXfRPLFFCl5xxY+1T9RKzOKjCut+28JSX2DnAk=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 h1:f9RyWNtS8oH7cZlbn+/JNPpjUk5+5fLd5lM9M0i49Ys=

cli/pkg/aws/dynamo_locking.go

@@ -1,15 +1,20 @@
 package aws
 
 import (
+	"context"
+	"errors"
 	"log"
 	"os"
-	"strconv"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/service/dynamodb"
-	"github.com/aws/aws-sdk-go/service/dynamodb/expression"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue"
+	"github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression"
+
+	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
+	"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
+
+	"github.com/aws/smithy-go"
 )
 
 const (
@@ -20,30 +25,27 @@ const (
 )
 
 type DynamoDbLock struct {
-	DynamoDb *dynamodb.DynamoDB
+	DynamoDb *dynamodb.Client
 }
 
 func isResourceNotFoundExceptionError(err error) bool {
 	if err != nil {
-		aerr, ok := err.(awserr.Error)
-		if !ok {
-			// not aws error
-			return false
-		}
-
-		if aerr.Code() == dynamodb.ErrCodeResourceNotFoundException {
-			// ErrCodeResourceNotFoundException code
-			return true
+		var apiError smithy.APIError
+		if errors.As(err, &apiError) {
+			switch apiError.(type) {
+			case *types.ResourceNotFoundException:
+				return true
+			}
 		}
 	}
 	return false
 }
 
-func (dynamoDbLock *DynamoDbLock) waitUntilTableCreated() error {
+func (dynamoDbLock *DynamoDbLock) waitUntilTableCreated(ctx context.Context) error {
 	input := &dynamodb.DescribeTableInput{
 		TableName: aws.String(TABLE_NAME),
 	}
-	status, err := dynamoDbLock.DynamoDb.DescribeTable(input)
+	status, err := dynamoDbLock.DynamoDb.DescribeTable(ctx, input)
 	cnt := 0
 
 	if err != nil {
@@ -52,9 +54,9 @@ func (dynamoDbLock *DynamoDbLock) waitUntilTableCreated() error {
 		}
 	}
 
-	for *status.Table.TableStatus != "ACTIVE" {
+	for status.Table.TableStatus != "ACTIVE" {
 		time.Sleep(TableCreationInterval)
-		status, err = dynamoDbLock.DynamoDb.DescribeTable(input)
+		status, err = dynamoDbLock.DynamoDb.DescribeTable(ctx, input)
 		if err != nil {
 			if !isResourceNotFoundExceptionError(err) {
 				return err
@@ -72,8 +74,8 @@ func (dynamoDbLock *DynamoDbLock) waitUntilTableCreated() error {
 }
 
 // TODO: refactor func to return actual error and fail on callers
-func (dynamoDbLock *DynamoDbLock) createTableIfNotExists() error {
-	_, err := dynamoDbLock.DynamoDb.DescribeTable(&dynamodb.DescribeTableInput{
+func (dynamoDbLock *DynamoDbLock) createTableIfNotExists(ctx context.Context) error {
+	_, err := dynamoDbLock.DynamoDb.DescribeTable(ctx, &dynamodb.DescribeTableInput{
 		TableName: aws.String(TABLE_NAME),
 	})
 
@@ -84,38 +86,39 @@ func (dynamoDbLock *DynamoDbLock) createTableIfNotExists() error {
 	}
 
 	createtbl_input := &dynamodb.CreateTableInput{
-		AttributeDefinitions: []*dynamodb.AttributeDefinition{
+
+		AttributeDefinitions: []types.AttributeDefinition{
 			{
 				AttributeName: aws.String("PK"),
-				AttributeType: aws.String("S"),
+				AttributeType: types.ScalarAttributeTypeS,
 			},
 			{
 				AttributeName: aws.String("SK"),
-				AttributeType: aws.String("S"),
+				AttributeType: types.ScalarAttributeTypeS,
 			},
 		},
-		KeySchema: []*dynamodb.KeySchemaElement{
+		KeySchema: []types.KeySchemaElement{
 			{
 				AttributeName: aws.String("PK"),
-				KeyType:       aws.String("HASH"),
+				KeyType:       types.KeyTypeHash,
 			},
 			{
 				AttributeName: aws.String("SK"),
-				KeyType:       aws.String("RANGE"),
+				KeyType:       types.KeyTypeRange,
 			},
 		},
-		BillingMode: aws.String("PAY_PER_REQUEST"),
+		BillingMode: types.BillingModePayPerRequest,
 		TableName:   aws.String(TABLE_NAME),
 	}
-	_, err = dynamoDbLock.DynamoDb.CreateTable(createtbl_input)
+	_, err = dynamoDbLock.DynamoDb.CreateTable(ctx, createtbl_input)
 	if err != nil {
 		if os.Getenv("DEBUG") != "" {
 			log.Printf("%v\n", err)
 		}
 		return err
 	}
 
-	err = dynamoDbLock.waitUntilTableCreated()
+	err = dynamoDbLock.waitUntilTableCreated(ctx)
 	if err != nil {
 		log.Printf("%v\n", err)
 		return err
@@ -125,7 +128,8 @@ func (dynamoDbLock *DynamoDbLock) createTableIfNotExists() error {
 }
 
 func (dynamoDbLock *DynamoDbLock) Lock(transactionId int, resource string) (bool, error) {
-	dynamoDbLock.createTableIfNotExists()
+	ctx := context.Background()
+	dynamoDbLock.createTableIfNotExists(ctx)
 	// TODO: remove timeout completely
 	now := time.Now().Format(time.RFC3339)
 	newTimeout := time.Now().Add(TableLockTimeout).Format(time.RFC3339)
@@ -143,24 +147,28 @@ func (dynamoDbLock *DynamoDbLock) Lock(transactionId int, resource string) (bool
 			).Set(expression.Name("timeout"), expression.Value(newTimeout)),
 		).
 		Build()
-
 	if err != nil {
 		return false, err
 	}
 
 	input := &dynamodb.UpdateItemInput{
-		TableName:                 aws.String(TABLE_NAME),
-		Key:                       map[string]*dynamodb.AttributeValue{"PK": {S: aws.String("LOCK")}, "SK": {S: aws.String("RES#" + resource)}},
+		TableName: aws.String(TABLE_NAME),
+		Key: map[string]types.AttributeValue{
+			"PK": &types.AttributeValueMemberS{Value: "LOCK"},
+			"SK": &types.AttributeValueMemberS{Value: "RES#" + resource},
+		},
 		ConditionExpression:       expr.Condition(),
 		ExpressionAttributeNames:  expr.Names(),
 		ExpressionAttributeValues: expr.Values(),
 		UpdateExpression:          expr.Update(),
 	}
 
-	_, err = dynamoDbLock.DynamoDb.UpdateItem(input)
+	_, err = dynamoDbLock.DynamoDb.UpdateItem(ctx, input)
 	if err != nil {
-		if aerr, ok := err.(awserr.Error); ok {
-			if aerr.Code() == dynamodb.ErrCodeConditionalCheckFailedException {
+		var apiError smithy.APIError
+		if errors.As(err, &apiError) {
+			switch apiError.(type) {
+			case *types.ConditionalCheckFailedException:
 				return false, nil
 			}
 		}
@@ -171,36 +179,50 @@ func (dynamoDbLock *DynamoDbLock) Lock(transactionId int, resource string) (bool
 }
 
 func (dynamoDbLock *DynamoDbLock) Unlock(resource string) (bool, error) {
-	dynamoDbLock.createTableIfNotExists()
+	ctx := context.Background()
+	dynamoDbLock.createTableIfNotExists(ctx)
 	input := &dynamodb.DeleteItemInput{
 		TableName: aws.String(TABLE_NAME),
-		Key:       map[string]*dynamodb.AttributeValue{"PK": {S: aws.String("LOCK")}, "SK": {S: aws.String("RES#" + resource)}},
+		Key: map[string]types.AttributeValue{
+			"PK": &types.AttributeValueMemberS{Value: "LOCK"},
+			"SK": &types.AttributeValueMemberS{Value: "RES#" + resource},
+		},
 	}
 
-	_, err := dynamoDbLock.DynamoDb.DeleteItem(input)
+	_, err := dynamoDbLock.DynamoDb.DeleteItem(ctx, input)
 	if err != nil {
 		return false, err
 	}
 	return true, nil
 }
 
 func (dynamoDbLock *DynamoDbLock) GetLock(lockId string) (*int, error) {
-	dynamoDbLock.createTableIfNotExists()
+	ctx := context.Background()
+	dynamoDbLock.createTableIfNotExists(ctx)
 	input := &dynamodb.GetItemInput{
 		TableName: aws.String(TABLE_NAME),
-		Key:       map[string]*dynamodb.AttributeValue{"PK": {S: aws.String("LOCK")}, "SK": {S: aws.String("RES#" + lockId)}},
+		Key: map[string]types.AttributeValue{
+			"PK": &types.AttributeValueMemberS{Value: "LOCK"},
+			"SK": &types.AttributeValueMemberS{Value: "RES#" + lockId},
+		},
 	}
 
-	result, err := dynamoDbLock.DynamoDb.GetItem(input)
+	result, err := dynamoDbLock.DynamoDb.GetItem(ctx, input)
 	if err != nil {
 		return nil, err
 	}
 
-	if result.Item != nil {
-		transactionId := result.Item["transaction_id"].N
-		res, err := strconv.Atoi(*transactionId)
-		return &res, err
+	type TransactionLock struct {
+		TransactionID int `dynamodbav:"transaction_id"`
 	}
 
+	var t TransactionLock
+	err = attributevalue.UnmarshalMap(result.Item, &t)
+	if err != nil {
+		return nil, err
+	}
+	if t.TransactionID != 0 {
+		return &t.TransactionID, nil
+	}
 	return nil, nil
 }