Merge pull request #163 from gallettilance/export-bug-fix

Bug 1795297: Fixing wrong database loaded in memory for export cmd

Author: openshift-merge-robot

opm-test.sh

@@ -2,8 +2,8 @@
 set -euxo pipefail
 
 echo "Setting Variables"
-read -p "Bunlde image path: " bundleImage
-read -p "Index image path: " indexImage
+read -p "Bunlde image: " bundleImage
+read -p "Index image tag: " indexImage
 read -p "docker or podman: " containerTool
 
 echo "building opm"
@@ -13,14 +13,14 @@ echo "building prometheus bundles"
 ./bin/opm alpha bundle build --directory manifests/prometheus/0.15.0 --tag $bundleImage:0.15.0 --package prometheus --channels preview --default preview
 ./bin/opm alpha bundle build --directory manifests/prometheus/0.22.2 --tag $bundleImage:0.22.2 --package prometheus --channels preview --default preview
 echo "pushing prometheus bundles"
-docker push $bundleImage:0.14.0
-docker push $bundleImage:0.15.0
-docker push $bundleImage:0.22.2
+$containerTool push $bundleImage:0.14.0
+$containerTool push $bundleImage:0.15.0
+$containerTool push $bundleImage:0.22.2
 echo "building index image with prometheus"
 ./bin/opm index add -b="$bundleImage:0.14.0,$bundleImage:0.15.0,$bundleImage:0.22.2" -t "$indexImage" -c="$containerTool"
 echo "pushing index image"
-docker push $indexImage
-echo "sleep for 1min before pulling image"
-sleep 1m
+$containerTool push $indexImage
+echo "sleep for 30s before pulling image"
+sleep 30s
 echo "exporting from index"
 ./bin/opm index export -i="$indexImage" -o="prometheus" -c="$containerTool"

pkg/lib/indexer/indexer.go

@@ -304,28 +304,26 @@ type ExportFromIndexRequest struct {
 // ExportFromIndex is an aggregate API used to specify operators from
 // an index image
 func (i ImageIndexer) ExportFromIndex(request ExportFromIndexRequest) error {
-	databaseFile := defaultDatabaseFile
-
 	// set a temp directory
 	workingDir, err := ioutil.TempDir("./", "index_tmp")
 	if err != nil {
 		return err
 	}
 	defer os.RemoveAll(workingDir)
 
-	db, err := sql.Open("sqlite3", databaseFile)
+	// extract the index database to the file
+	databaseFile, err := i.WriteIndexDBFile(request.Index, workingDir, defaultDatabaseFile)
 	if err != nil {
 		return err
 	}
-	defer db.Close()
 
-	dbQuerier := sqlite.NewSQLLiteQuerierFromDb(db)
+	db, err := sql.Open("sqlite3", databaseFile)
 	if err != nil {
 		return err
 	}
+	defer db.Close()
 
-	// extract the index database to the file
-	databaseFile, err = i.WriteIndexDBFile(request.Index, workingDir, databaseFile)
+	dbQuerier := sqlite.NewSQLLiteQuerierFromDb(db)
 	if err != nil {
 		return err
 	}