From e3f4d9f01231865aef49581e3dd49df1cba20f25 Mon Sep 17 00:00:00 2001
From: Michael Hohn <hohn@github.com>
Date: Mon, 8 Jul 2024 14:23:25 -0700
Subject: [PATCH] Use QL_DB_BUCKET_NAME in shell and go

---
 pkg/qldbstore/qldbstore_minio.go | 10 +++++-----
 populate-dbstore.sh              |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/qldbstore/qldbstore_minio.go b/pkg/qldbstore/qldbstore_minio.go
index 8c04717..d91e7db 100644
--- a/pkg/qldbstore/qldbstore_minio.go
+++ b/pkg/qldbstore/qldbstore_minio.go
@@ -12,7 +12,7 @@ import (
 	"github.com/minio/minio-go/v7/pkg/credentials"
 )
 
-const bucketName = "qldb"
+const QL_DB_BUCKETNAME = "qldb"
 
 type MinIOCodeQLDatabaseStore struct {
 	client     *minio.Client
@@ -30,14 +30,14 @@ func NewMinIOCodeQLDatabaseStore(endpoint, id, secret string) (*MinIOCodeQLDatab
 
 	slog.Info("Connected to MinIO CodeQL database store server")
 
-	err = common.CreateMinIOBucketIfNotExists(minioClient, bucketName)
+	err = common.CreateMinIOBucketIfNotExists(minioClient, QL_DB_BUCKETNAME)
 	if err != nil {
 		return nil, fmt.Errorf("could not create bucket: %v", err)
 	}
 
 	return &MinIOCodeQLDatabaseStore{
 		client:     minioClient,
-		bucketName: bucketName,
+		bucketName: QL_DB_BUCKETNAME,
 	}, nil
 }
 
@@ -90,8 +90,8 @@ func (store *MinIOCodeQLDatabaseStore) GetDatabaseLocationByNWO(nwo common.NameW
 
 	location := CodeQLDatabaseLocation{
 		data: map[string]string{
-			"bucket": store.bucketName,
-			"key":    objectName,
+			artifactstore.AF_KEY_BUCKET: store.bucketName,
+			artifactstore.AF_KEY_KEY:    objectName,
 		},
 	}
 
diff --git a/populate-dbstore.sh b/populate-dbstore.sh
index 184a984..692edb4 100755
--- a/populate-dbstore.sh
+++ b/populate-dbstore.sh
@@ -5,7 +5,7 @@ MINIO_ALIAS="qldbminio"
 MINIO_URL="http://localhost:9000"
 MINIO_ROOT_USER="user"
 MINIO_ROOT_PASSWORD="mmusty8432"
-BUCKET_NAME="qldb"
+QL_DB_BUCKET_NAME="qldb"
 
 # Check for MinIO client
 if ! command -v mc &> /dev/null
@@ -18,14 +18,14 @@ fi
 mc alias set $MINIO_ALIAS $MINIO_URL $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD
 
 # Create qldb bucket
-mc mb $MINIO_ALIAS/$BUCKET_NAME
+mc mb $MINIO_ALIAS/$QL_DB_BUCKET_NAME
 
 # Upload the two sample DBs with new names
 mc cp cmd/server/codeql/dbs/google/flatbuffers/google_flatbuffers_db.zip \
-    $MINIO_ALIAS/$BUCKET_NAME/google\$flatbuffers.zip
+    $MINIO_ALIAS/$QL_DB_BUCKET_NAME/google\$flatbuffers.zip
 
 mc cp cmd/server/codeql/dbs/psycopg/psycopg2/psycopg_psycopg2_db.zip \
-    $MINIO_ALIAS/$BUCKET_NAME/psycopg\$psycopg2.zip
+    $MINIO_ALIAS/$QL_DB_BUCKET_NAME/psycopg\$psycopg2.zip
 
 # Check new disk use
 du -k dbstore-data