diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 8133b17..32480a6 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v4 - name: check valid sh - run: shellcheck tests/*.sh + run: shellcheck **/*.sh - uses: actions/setup-go@v4 @@ -24,9 +24,9 @@ jobs: run: ./tests/starter-site.sh - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.59.1 + version: latest - name: Run tests run: go test -v ./... && git diff fixtures diff --git a/README.md b/README.md index 3c77073..8a6be4d 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Generate an Open API spec based on your Islandora data model ``` go-islandora generate node-structs \ --node-cex-yaml=path/to/drupal/config/sync/node.type.islandora_object.yml \ - --output=api.yml + --output=api.yaml -go-islandora generate sheets-structs --output=workbench.yml +go-islandora generate sheets-structs --output=workbench.yaml ``` diff --git a/cmd/sheetsStructs.go b/cmd/sheetsStructs.go index 54ddedf..21c1aac 100644 --- a/cmd/sheetsStructs.go +++ b/cmd/sheetsStructs.go @@ -114,8 +114,9 @@ func sheetsFields() []CsvColumn { "Catalog or ArchivesSpace URL": "field_identifier.attr0=uri", "Call Number": "field_identifier.attr0=call-number", "Report Number (included only on ATLSS and Fritz Lab spreadsheet)": "field_identifier.attr0=report-number", - "Rights Statement": "field_rights", - "Access": "field_access", + "Rights Statement": "field_rights", + "Access": "field_access", + "Supplemental File": "supplemental_file", } for column, field := range f { fields = append(fields, CsvColumn{ diff --git a/workbench/workbench.gen.go b/workbench/workbench.gen.go index 836c30c..6ba1fa7 100644 --- a/workbench/workbench.gen.go +++ b/workbench/workbench.gen.go @@ -66,6 +66,7 @@ type SheetsCsv struct { SubjectGeographicLocal *string `csv:"field_geographic_subject.vid=geographic_local" json:"Subject Geographic (Local),omitempty"` SubjectNameLCNAF *string `csv:"field_subjects_name" json:"Subject Name (LCNAF),omitempty"` SubjectTopicLCSH *string `csv:"field_subject_lcsh" json:"Subject Topic (LCSH),omitempty"` + SupplementalFile *string `csv:"supplemental_file" json:"Supplemental File,omitempty"` Title *string `csv:"title" json:"Title,omitempty"` UploadID *string `csv:"id" json:"Upload ID,omitempty"` VolumeNumber *string `csv:"field_part_detail.attr0=volume" json:"Volume Number,omitempty"`