Merge pull request #460 from pixlise/feature/detector-config-contents

Feature/detector config contents

Author: pnemere

api/piquant/configuration_test.go

@@ -11,8 +11,12 @@ func Example_piquant_ReadFieldFromPIQUANTConfigMSA() {
 #SOLIDANGLE  : 0.224 Solid angle collected by the detector in steradians`
 
 	a, err := ReadFieldFromPIQUANTConfigMSA(piquantMSA, "ELEVANGLE")
+	fmt.Printf("%v|%v\n", a, err)
+
+	a, err = ReadFieldFromPIQUANTConfigMSA(piquantMSA, "ELEEEVANGLE")
 	fmt.Printf("%v|%v", a, err)
 
 	// Output:
 	// 48.03|<nil>
+	// 0|Failed to find field ELEEEVANGLE
 }

api/ws/handlers/piquant.go

@@ -109,3 +109,31 @@ func HandlePiquantWriteCurrentVersionReq(req *protos.PiquantWriteCurrentVersionR
 
 	return &protos.PiquantWriteCurrentVersionResp{}, nil
 }
+
+// TODO: DO A SIMPLE INTEGRATION TEST FOR THIS!!
+func HandlePiquantConfigFileReq(req *protos.PiquantConfigFileReq, hctx wsHelpers.HandlerContext) (*protos.PiquantConfigFileResp, error) {
+	// Validate inputs
+	if err := wsHelpers.CheckStringField(&req.ConfigId, "ConfigId", 1, wsHelpers.IdFieldMaxLength); err != nil {
+		return nil, err
+	}
+	if err := wsHelpers.CheckStringField(&req.Version, "Version", 1, wsHelpers.IdFieldMaxLength); err != nil {
+		return nil, err
+	}
+	if err := wsHelpers.CheckStringField(&req.Filename, "Filename", 1, 255); err != nil {
+		return nil, err
+	}
+
+	// Build the file path
+	filePath := filepaths.GetDetectorConfigPath(req.ConfigId, req.Version, req.Filename)
+
+	// Read the file from S3
+	fileBytes, err := hctx.Svcs.FS.ReadObject(hctx.Svcs.Config.ConfigBucket, filePath)
+	if err != nil {
+		hctx.Svcs.Log.Errorf("Failed to read piquant config file %v/%v: %v", hctx.Svcs.Config.ConfigBucket, filePath, err)
+		return nil, err
+	}
+
+	return &protos.PiquantConfigFileResp{
+		Contents: string(fileBytes),
+	}, nil
+}