Skip to content

Commit b7357dd

Browse files
committed
[server] fix primary index creation for couchbase
1 parent a1df2ce commit b7357dd

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

server/crypto/aes.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"crypto/aes"
55
"crypto/cipher"
66
"crypto/rand"
7-
"fmt"
87
"io"
98

109
"github.com/authorizerdev/authorizer/server/constants"
@@ -57,7 +56,6 @@ func DecryptAES(text string) (string, error) {
5756
func EncryptAESEnv(text []byte) ([]byte, error) {
5857
var res []byte
5958
k, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyEncryptionKey)
60-
fmt.Println("=> key:", k)
6159
if err != nil {
6260
return res, err
6361
}

server/db/providers/couchbase/provider.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"errors"
66
"fmt"
77
"reflect"
8+
"strings"
9+
"time"
810

911
"github.com/couchbase/gocb/v2"
1012

@@ -64,10 +66,13 @@ func NewProvider() (*provider, error) {
6466
if err != nil && !errors.Is(err, gocb.ErrCollectionExists) {
6567
return nil, err
6668
}
69+
// TODO: find how to fix this sleep time.
70+
// Add wait time for successful collection creation
71+
time.Sleep(5 * time.Second)
6772
indexQuery := fmt.Sprintf("CREATE PRIMARY INDEX ON %s.%s", scopeIdentifier, collectionName.String())
6873
_, err = scope.Query(indexQuery, nil)
69-
if err != nil {
70-
fmt.Println("=> err", err, collectionName.String())
74+
if err != nil && !strings.Contains(err.Error(), "The index #primary already exists") {
75+
return nil, err
7176
}
7277
}
7378

@@ -93,24 +98,20 @@ func CreateBucketAndScope(cluster *gocb.Cluster, bucketName string, scopeName st
9398
FlushEnabled: true,
9499
CompressionMode: gocb.CompressionModeActive,
95100
}
96-
97101
err := cluster.Buckets().CreateBucket(gocb.CreateBucketSettings{
98102
BucketSettings: settings,
99103
ConflictResolutionType: gocb.ConflictResolutionTypeSequenceNumber,
100104
}, nil)
101-
102105
bucket := cluster.Bucket(bucketName)
103106
if err != nil && !errors.Is(err, gocb.ErrBucketExists) {
104107
return bucket, err
105108
}
106-
107109
if scopeName != defaultScope {
108110
err = bucket.Collections().CreateScope(scopeName, nil)
109111
if err != nil && !errors.Is(err, gocb.ErrScopeExists) {
110112
return bucket, err
111113
}
112114
}
113-
114115
return bucket, nil
115116
}
116117

server/env/persist_env.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package env
33
import (
44
"context"
55
"encoding/json"
6-
"fmt"
76
"os"
87
"reflect"
98
"strconv"
@@ -116,7 +115,6 @@ func PersistEnv() error {
116115
if err != nil || env.EnvData == "" {
117116
// AES encryption needs 32 bit key only, so we chop off last 4 characters from 36 bit uuid
118117
hash := uuid.New().String()[:36-4]
119-
fmt.Println("hash:", hash)
120118
err := memorystore.Provider.UpdateEnvVariable(constants.EnvKeyEncryptionKey, hash)
121119
if err != nil {
122120
log.Debug("Error while updating encryption env variable: ", err)

server/resolvers/admin_signup.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ func AdminSignupResolver(ctx context.Context, params model.AdminSignupInput) (*m
6767
envData, err := crypto.EncryptEnvData(storeData)
6868
if err != nil {
6969
log.Debug("Failed to encrypt envstore: ", err)
70-
fmt.Println("Failed to encrypt envstore: ", err)
7170
return res, err
7271
}
7372

0 commit comments

Comments
 (0)