Private data indexes with tests

cmd/release/main_test.go

@@ -48,8 +48,16 @@ var _ = Describe("Main", func() {
 
 		indexPath := filepath.Join(tempDir, "statedb", "couchdb", "indexes", "indexOwner.json")
 		Expect(indexPath).To(BeARegularFile())
+
+		assetPrivateDataCollectionIndexPath := filepath.Join(tempDir, "statedb", "couchdb", "collections", "assetCollection", "indexes", "indexOwner.json")
+		Expect(assetPrivateDataCollectionIndexPath).To(BeARegularFile(), "Private data index should be copied")
+
+		fabCarPrivateDataCollectionIndexPath := filepath.Join(tempDir, "statedb", "couchdb", "collections", "fabCarCollection", "indexes", "indexOwner.json")
+		Expect(fabCarPrivateDataCollectionIndexPath).To(BeARegularFile(), "Private data index should be copied")
+
 		textPath := filepath.Join(tempDir, "statedb", "couchdb", "indexes", "test.txt")
-		Expect(textPath).NotTo(BeAnExistingFile())
+		Expect(textPath).NotTo(BeAnExistingFile(), "Unexpected files should not be copied")
+
 		subdirPath := filepath.Join(
 			tempDir,
 			"statedb",
@@ -58,6 +66,18 @@ var _ = Describe("Main", func() {
 			"subdir",
 			"indexOwner.json",
 		)
-		Expect(subdirPath).NotTo(BeAnExistingFile())
+		Expect(subdirPath).NotTo(BeAnExistingFile(), "Files outside indexes directory should not be copied")
+
+		privateDataCollectionSubdirPath := filepath.Join(
+			tempDir,
+			"statedb",
+			"couchdb",
+			"collections",
+			"fabCarCollection",
+			"subdir",
+			"indexes",
+			"indexOwner.json",
+		)
+		Expect(privateDataCollectionSubdirPath).NotTo(BeAnExistingFile(), "Files outside indexes directory should not be copied")
 	})
 })

cmd/release/testdata/buildwithindexes/META-INF/statedb/couchdb/collections/assetCollection/indexes/indexOwner.json

@@ -0,0 +1,11 @@
+{
+    "index": {
+      "fields": [
+        "objectType",
+        "owner"
+      ]
+    },
+    "ddoc": "indexOwnerDoc",
+    "name": "indexOwner",
+    "type": "json"
+}

cmd/release/testdata/buildwithindexes/META-INF/statedb/couchdb/collections/fabCarCollection/indexes/indexOwner.json

@@ -0,0 +1,11 @@
+{
+    "index": {
+      "fields": [
+        "model",
+        "owner"
+      ]
+    },
+    "ddoc": "indexOwnerDoc",
+    "name": "indexOwner",
+    "type": "json"
+}

cmd/release/testdata/buildwithindexes/META-INF/statedb/couchdb/collections/fabCarCollection/subdir/indexes/indexOwner.json

@@ -0,0 +1 @@
+{"index":{"fields":["docType","owner"]},"ddoc":"indexOwnerDoc", "name":"indexOwner","type":"json"}

internal/util/copy.go

@@ -41,7 +41,7 @@
 
 // CopyIndexFiles copies CouchDB index definitions from source to destination directories.
 func CopyIndexFiles(logger *log.CmdLogger, src, dest string) error {
-	indexDir := filepath.Join("statedb", "couchdb", "indexes")
+	indexDir := filepath.Join("statedb", "couchdb")
 	indexSrcDir := filepath.Join(src, MetadataDir, indexDir)
 	indexDestDir := filepath.Join(dest, indexDir)
 
@@ -67,7 +67,27 @@
 
 	opt := copy.Options{
 		Skip: func(_ os.FileInfo, src, _ string) (bool, error) {
-			return !strings.HasSuffix(src, ".json"), nil
+			logger.Debugf("Checking source copy path: %s", src)
+			fileInfo, err := os.Lstat(src)
+			if err != nil {
+				return true, fmt.Errorf(
+					"failed to create CouchDB index definitions from folder %s: %w",
+					src,
+					err,
+				)
+			}
+			if fileInfo.IsDir() { // copy it recursively
+				logger.Debugf("This is a folder, copying: %s", src)
+				return false, nil
+			} else { // any non JSON will be skipped
+				isJsonFile := strings.HasSuffix(src, ".json")
+				if isJsonFile {
+					logger.Debugf("This is a JSON file, copying: %s", src)
+				} else {
+					logger.Debugf("This is NOT a JSON file, skipping copy: %s", src)
+				}
+				return !isJsonFile, nil
+			}
 		},
 	}