Merge pull request #439 from pixlise/fixes

Fixes

Author: pnemere

.github/workflows/main.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.22.0"
       - name: Start MongoDB
         uses: supercharge/mongodb-github-action@1.10.0
         with:
@@ -125,7 +125,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.22.0"
       - name: Print Version
         run: |
           echo "BUILDING VERSION ${{ needs.version.outputs.version }}"

Dockerfile

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-FROM golang:1.21-alpine AS builder
+FROM golang:1.22-alpine AS builder
 ARG VERSION
 ARG GITHUB_SHA
 

api/dataimport/dataimportHelpers/beamLocation_test.go

@@ -159,7 +159,7 @@ func Example_parseBeamLocations() {
 }
 
 // This is kind of redunant, was already tested elsewhere, but this is an easy point to add a file and run the test to make sure it imports!
-func Example_ReadBeamLocationsFile() {
+func Example_dataImportHelpers_ReadBeamLocationsFile() {
 	rxl, pmcs, err := ReadBeamLocationsFile("./test-data/GeomCorrMoved.CSV", true, 4, []string{}, &logger.StdOutLoggerForTest{})
 	fmt.Printf("%v\npmcs: %v\nrxl: %v\n", err, pmcs, len(rxl))
 

api/dataimport/for-trigger_test.go

@@ -471,7 +471,7 @@ func Example_importForTrigger_Manual_SBU() {
 }
 
 // Import a breadboard dataset from manual uploaded zip file
-func Example_ImportForTrigger_Manual_SBU_NoAutoShare() {
+func Example_dataimport_ImportForTrigger_Manual_SBU_NoAutoShare() {
 	remoteFS, log, configBucket, datasetBucket, manualBucket, db := initTest("Manual_SBU_NoAutoShare", "Manual_OK2", specialUserIds.JPLImport, "JPLTestUserGroupId")
 
 	trigger := `{

api/dataimport/internal/converters/jplbreadboard/spectra_test.go

@@ -168,7 +168,7 @@ func Example_makeBulkMaxSpectra() {
 	// [3]=meta [DETECTOR_ID:B/s LIVETIME:9.75/f OFFSET:50/f PMC:3/i READTYPE:MaxValue/s SOURCEFILE:GeneratedByPIXLISEConverter/s XPERCHAN:40/f] spectrum [21 22 23]
 }
 
-func Example_EVCalibrationOverride() {
+func Example_jplbreadboard_EVCalibrationOverride() {
 	spectrumLookup := dataConvertModels.DetectorSampleByPMC{
 		1: []dataConvertModels.DetectorSample{
 			dataConvertModels.DetectorSample{

api/dataimport/internal/importerutils/contextImages_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/pixlise/core/v4/core/logger"
 )
 
-func Example_GetContextImagesPerPMCFromListing() {
+func Example_importerutils_GetContextImagesPerPMCFromListing() {
 	listing := []string{"../datasets/FM_5x5/P13177_5x5_190602/hk.txt", "../datasets/FM_5x5/P13177_5x5_190602/0612747347_000001C5_005048.jpg", "../datasets/FM_5x5/P13177_5x5_190602/0612756313_000001C5_005651.jpg", "../datasets/FM_5x5/P13177_5x5_190602/.DS_Store", "../datasets/FM_5x5/P13177_5x5_190602/0612744373_000001C5_004847.jpg", "../datasets/FM_5x5/P13177_5x5_190602/0612735422_000001C5_004244.jpg", "../datasets/FM_5x5/P13177_5x5_190602/0612758681_000001C5_005807.jpg", "../datasets/FM_5x5/P13177_5x5_190602/0612741400_000001C5_004646.jpg", "../datasets/FM_5x5/P13177_5x5_190602/hk_data.csv", "../datasets/FM_5x5/P13177_5x5_190602/0612732390_000001C5_004042.jpg", "../datasets/FM_5x5/P13177_5x5_190602/0612750353_000001C5_005249.jpg", "../datasets/FM_5x5/P13177_5x5_190602/0612738397_000001C5_004445.jpg", "../datasets/FM_5x5/P13177_5x5_190602/0612753334_000001C5_005450.jpg"}
 	results := GetContextImagesPerPMCFromListing(listing, &logger.StdOutLogger{})
 

api/dataimport/pre-import_test.go

@@ -28,7 +28,7 @@ import (
 )
 
 // Trigger for a manual dataset regeneration (user clicks save button on dataset edit page)
-func Example_ProcessEM() {
+func Example_dataimport_ProcessEM() {
 	p := "./test-data/PreImport/20240805_EM_V8.2_ATP_Test_65_A_Day_in_the_Life.zip"
 	zFile, err := os.ReadFile(p)
 

api/job/runner/runner_test.go

@@ -9,23 +9,23 @@ import (
 	"github.com/pixlise/core/v4/core/fileaccess"
 )
 
-func Example_RunJob_NoConfig() {
+func Example_jobrunner_RunJob_NoConfig() {
 	os.Setenv(JobConfigEnvVar, "")
 	fmt.Printf("%v\n", RunJob(false))
 
 	// Output:
 	// JOB_CONFIG env var not set
 }
 
-func Example_RunJob_BadConfig() {
+func Example_jobrunner_RunJob_BadConfig() {
 	os.Setenv(JobConfigEnvVar, "{ \"Some\": \"unfinished JSON }")
 	fmt.Printf("%v\n", RunJob(false))
 
 	// Output:
 	// Failed to parse env var JOB_CONFIG: unexpected end of JSON input
 }
 
-func Example_RunJob_NoCommand() {
+func Example_jobrunner_RunJob_NoCommand() {
 	cfg := JobConfig{
 		JobId: "Job001",
 	}
@@ -44,7 +44,7 @@ func Example_RunJob_NoCommand() {
 	// Job: No command specified
 }
 
-func Example_RunJob_BadInputLocalPath() {
+func Example_jobrunner_RunJob_BadInputLocalPath() {
 	cfg := JobConfig{
 		JobId:         "Job001",
 		RequiredFiles: []JobFilePath{{LocalPath: "", RemoteBucket: "test-piquant", RemotePath: "jobs/Job001/input.csv"}},
@@ -68,7 +68,7 @@ func Example_RunJob_BadInputLocalPath() {
 	// Job: No localPath specified
 }
 
-func Example_RunJob_BadInputRemotePath() {
+func Example_jobrunner_RunJob_BadInputRemotePath() {
 	cfg := JobConfig{
 		JobId:         "Job001",
 		RequiredFiles: []JobFilePath{{LocalPath: "input.csv", RemoteBucket: "test-piquant", RemotePath: "jobs/Job001/input.csv"}},
@@ -93,7 +93,7 @@ func Example_RunJob_BadInputRemotePath() {
 	// Job: Failed to download s3://test-piquant/jobs/Job001/input.csv: Not found
 }
 
-func Example_RunJob_UploadNotThere() {
+func Example_jobrunner_RunJob_UploadNotThere() {
 	cfg := JobConfig{
 		JobId:   "Job001",
 		Command: NoOpCommand,
@@ -121,7 +121,7 @@ func Example_RunJob_UploadNotThere() {
 	// Job: Job Job001 failed to generate/upload output files: nofile.txt
 }
 
-func Example_RunJob_DownloadUploadOK() {
+func Example_jobrunner_RunJob_DownloadUploadOK() {
 	// Before we do anything, ensure the file is in S3
 	sess, err := awsutil.GetSession()
 	fmt.Printf("GetSession: %v\n", err)

api/memoisation/garbageCollection_test.go

@@ -13,7 +13,7 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
-func Example_CollectGarbage() {
+func Example_memoisation_CollectGarbage() {
 	db := wstestlib.GetDB()
 	ctx := context.TODO()
 	coll := db.Collection(dbCollections.MemoisedItemsName)

api/piquant/configuration_test.go

@@ -2,7 +2,7 @@ package piquant
 
 import "fmt"
 
-func Example_ReadFieldFromPIQUANTConfigMSA() {
+func Example_piquant_ReadFieldFromPIQUANTConfigMSA() {
 	piquantMSA := `##INCSR      : 0.0152   Solid angle from source in steradians (can include normalization for optic file - use this for tuning 0.00355)
 ##INCANGLE   : 90.00   Incident angle of primary X-ray beam in degrees (90 is normal incidence)
 #ELEVANGLE   : 48.03   Elevation angle of detector, in degrees (90 is normal to surface)