dynamod db index changes added to the schema

server/db/providers/dynamodb/email_template.go

@@ -95,7 +95,7 @@ func (p *provider) GetEmailTemplateByEventName(ctx context.Context, eventName st
 	var emailTemplates []models.EmailTemplate
 	var emailTemplate models.EmailTemplate
 
-	err := collection.Scan().Filter("'event_name' = ?", eventName).Limit(1).AllWithContext(ctx, &emailTemplates)
+	err := collection.Scan().Index("event_name").Filter("'event_name' = ?", eventName).Limit(1).AllWithContext(ctx, &emailTemplates)
 	if err != nil {
 		return nil, err
 	}

server/db/providers/dynamodb/otp.go

@@ -52,7 +52,7 @@ func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*mod
 
 	collection := p.db.Table(models.Collections.OTP)
 
-	err := collection.Scan().Filter("'email' = ?", emailAddress).Limit(1).AllWithContext(ctx, &otps)
+	err := collection.Scan().Index("email").Filter("'email' = ?", emailAddress).Limit(1).AllWithContext(ctx, &otps)
 
 	if err != nil {
 		return nil, err

server/db/providers/dynamodb/provider.go

@@ -2,51 +2,49 @@ package dynamodb
 
 import (
 	"github.com/authorizerdev/authorizer/server/db/models"
+	"github.com/authorizerdev/authorizer/server/memorystore"
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/guregu/dynamo"
 )
 
-// TODO change following provider to new db provider
 type provider struct {
 	db *dynamo.DB
 }
 
-// NewProvider returns a new SQL provider
-// TODO change following provider to new db provider
+// NewProvider returns a new Dynamo provider
 func NewProvider() (*provider, error) {
+	region := memorystore.RequiredEnvStoreObj.GetRequiredEnv().REGION
+	dbURL := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseURL
+	accessKey := memorystore.RequiredEnvStoreObj.GetRequiredEnv().AWS_ACCESS_KEY
+	secretKey := memorystore.RequiredEnvStoreObj.GetRequiredEnv().AWS_SECRET_KEY
 	config := aws.Config{
-		Endpoint: aws.String("http://localhost:8000"),
-		Region:   aws.String("us-east-1"),
+		Region:     aws.String(region),
+		MaxRetries: aws.Int(3),
 	}
-	session := session.Must(session.NewSession())
-	db := dynamo.New(session, &config)
 
-	if err := db.CreateTable(models.Collections.User, models.User{}).Wait(); err != nil {
-		// fmt.Println(" User", err)
-	}
-	if err := db.CreateTable(models.Collections.Session, models.Session{}).Wait(); err != nil {
-		// fmt.Println("Session error", err)
-	}
-	if err := db.CreateTable(models.Collections.EmailTemplate, models.EmailTemplate{}).Wait(); err != nil {
-		// fmt.Println(" EmailTemplate", err)
-	}
-	if err := db.CreateTable(models.Collections.Env, models.Env{}).Wait(); err != nil {
-		// fmt.Println(" Env", err)
-	}
-	if err := db.CreateTable(models.Collections.OTP, models.OTP{}).Wait(); err != nil {
-		// fmt.Println(" OTP", err)
-	}
-	if err := db.CreateTable(models.Collections.VerificationRequest, models.VerificationRequest{}).Wait(); err != nil {
-		// fmt.Println(" VerificationRequest", err)
-	}
-	if err := db.CreateTable(models.Collections.Webhook, models.Webhook{}).Wait(); err != nil {
-		// fmt.Println(" Webhook", err)
-	}
-	if err := db.CreateTable(models.Collections.WebhookLog, models.WebhookLog{}).Wait(); err != nil {
-		// fmt.Println(" WebhookLog", err)
+	// custom accessKey, secretkey took first priority, if not then fetch config from aws credentials
+	if accessKey != "" && secretKey != "" {
+		config.Credentials = credentials.NewStaticCredentials(accessKey, secretKey, "")
+	} else if dbURL != "" {
+		// static config in case of testing or local-setup
+		config.Credentials = credentials.NewStaticCredentials("key", "key", "")
+		config.Endpoint = aws.String(dbURL)
 	}
 
+	session := session.Must(session.NewSession(&config))
+	db := dynamo.New(session)
+
+	db.CreateTable(models.Collections.User, models.User{}).Wait()
+	db.CreateTable(models.Collections.Session, models.Session{}).Wait()
+	db.CreateTable(models.Collections.EmailTemplate, models.EmailTemplate{}).Wait()
+	db.CreateTable(models.Collections.Env, models.Env{}).Wait()
+	db.CreateTable(models.Collections.OTP, models.OTP{}).Wait()
+	db.CreateTable(models.Collections.VerificationRequest, models.VerificationRequest{}).Wait()
+	db.CreateTable(models.Collections.Webhook, models.Webhook{}).Wait()
+	db.CreateTable(models.Collections.WebhookLog, models.WebhookLog{}).Wait()
+
 	return &provider{
 		db: db,
 	}, nil

server/db/providers/dynamodb/user.go

@@ -131,7 +131,7 @@ func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.Use
 	var user models.User
 
 	collection := p.db.Table(models.Collections.User)
-	err := collection.Scan().Filter("'email' = ?", email).AllWithContext(ctx, &users)
+	err := collection.Scan().Index("email").Filter("'email' = ?", email).AllWithContext(ctx, &users)
 
 	if err != nil {
 		return user, nil

server/db/providers/dynamodb/webhook.go

@@ -22,6 +22,7 @@ func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*mod
 	webhook.Key = webhook.ID
 	webhook.CreatedAt = time.Now().Unix()
 	webhook.UpdatedAt = time.Now().Unix()
+
 	err := collection.Put(webhook).RunWithContext(ctx)
 
 	if err != nil {
@@ -106,7 +107,7 @@ func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string)
 	var webhook models.Webhook
 	collection := p.db.Table(models.Collections.Webhook)
 
-	iter := collection.Scan().Filter("'event_name' = ?", eventName).Iter()
+	iter := collection.Scan().Index("event_name").Filter("'event_name' = ?", eventName).Iter()
 
 	for iter.NextWithContext(ctx, &webhook) {
 		return webhook.AsAPIWebhook(), nil

server/db/providers/dynamodb/webhook_log.go

@@ -44,7 +44,7 @@ func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Paginat
 	scanner := collection.Scan()
 
 	if webhookID != "" {
-		iter = scanner.Filter("'webhook_id' = ?", webhookID).Iter()
+		iter = scanner.Index("webhook_id").Filter("'webhook_id' = ?", webhookID).Iter()
 		for iter.NextWithContext(ctx, &webhookLog) {
 			webhookLogs = append(webhookLogs, webhookLog.AsAPIWebhookLog())
 		}