diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 3d6364e..cbbd091 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -25,9 +25,6 @@ jobs: - name: Test with the Go CLI run: go test -v ./... - - name: ensure generated code is up-to-date - run: go generate ./api && git diff - build-push: needs: [lint-test] runs-on: ubuntu-latest diff --git a/fixtures/tmpl.csv b/fixtures/tmpl.csv index 47cf331..1b1b3c2 100644 --- a/fixtures/tmpl.csv +++ b/fixtures/tmpl.csv @@ -1,2 +1 @@ -Machine Name,id,parent_id,field_weight,nid,field_member_of,field_model,file,field_add_coverpage,title,field_full_title,published,field_linked_agent.name,field_linked_agent.rel_type,field_linked_agent.vid,field_linked_agent.entity.field_identifier.attr0=orcid,field_linked_agent.entity.field_contributor_status,field_linked_agent.entity.field_email,field_linked_agent.entity.field_relationships,field_department_name,field_resource_type,field_genre,field_edtf_date_issued,field_date_season,field_edtf_date_captured,field_edtf_date_embargo,field_publisher,field_edition,field_language,field_physical_form,field_media_type,field_extent.attr0=page,field_extent.attr0=dimensions,field_extent.attr0=bytes,field_extent.attr0=minutes,field_digital_origin,field_abstract.attr0=description,field_abstract.attr0=abstract,field_note.attr0=preferred-citation,field_note.attr0=capture-device,field_note.attr0=ppi,field_note.attr0=collection,field_note.attr0=box,field_note.attr0=series,field_note.attr0=folder,field_local_restriction,field_subject_lcsh,field_keywords,field_subjects_name,field_geographic_subject.vid=geographic_naf,field_geographic_subject.vid=geographic_local,field_subject_hierarchical_geo,field_related_item.title,field_related_item.identifier_type=issn,field_part_detail.attr0=voume,field_part_detail.attr0=issue,field_part_detail.attr0=page,field_identifier.attr0=doi,field_identifier.attr0=uri,field_identifier.attr0=call-number,field_identifier.attr0=report-number,field_rights,field_access -Human Name,Upload ID,Page/Item Parent ID,Child Sort Order,Node ID,Parent Collection,Object Model,File Path,Add Coverpage (Y/N),Title,Full Title,Make Public (Y/N),Creator/Contributor Name 1,Contributor Relator 1,Contributor Type 1,ORCID Number 1,Contributor Status 1,Contributor Email 1,Contributor Institution 1,Related Department,Resource Type,Genre (Getty AAT),Creation Date,Season,Date Captured,Embargo Until Date,Publisher,Edition,Language,Physical Format (Getty AAT),File Format (MIME Type),Page Count,Dimensions,File Size,Run Time (HH:MM:SS),Digital Origin,Description,Abstract,Preferred-Citation (included only in Fritz Lab and Environmental reports),Capture Device,PPI,Archival Collection,Archival Box,Archival Series,Archival Folder,Local Restriction,Subject Topic (LCSH),Keyword,Subject Name (LCNAF),Subject Geographic (LCNAF),Subject Geographic (Local),Hierarchical Geographic (Getty TGN),Source Publication Title,Source Publication L-ISSN,Volume Number,Issue Number,Page Numbers,DOI,Catalog or ArchivesSpace URL,Call Number,Report Number (included only on ATLSS and Fritz Lab spreadsheet),Rights Statement,Access +Upload ID,Page/Item Parent ID,Child Sort Order,Node ID,Parent Collection,Object Model,File Path,Add Coverpage (Y/N),Title,Full Title,Make Public (Y/N),Contributor Name 1,Contributor Relator 1,Contributor Type 1,ORCID Number 1,Contributor Status 1,Contributor Email 1,Contributor Institution 1,Related Department,Resource Type,Genre (Getty AAT),Creation Date,Season,Date Captured,Embargo Until Date,Publisher,Edition,Language,Physical Format (Getty AAT),File Format (MIME Type),Page Count,Dimensions,File Size,Run Time (HH:MM:SS),Digital Origin,Description,Abstract,Preferred-Citation (included only in Fritz Lab and Environmental reports),Capture Device,PPI,Archival Collection,Archival Box,Archival Series,Archival Folder,Local Restriction,Subject Topic (LCSH),Keyword,Subject Name (LCNAF),Subject Geographic (LCNAF),Subject Geographic (Local),Hierarchical Geographic (Getty TGN),Source Publication Title,Source Publication L-ISSN,Volume Number,Issue Number,Page Numbers,DOI,Catalog or ArchivesSpace URL,Call Number,Report Number (included only on ATLSS and Fritz Lab spreadsheet),Rights Statement,Access \ No newline at end of file diff --git a/go.mod b/go.mod index 55520ec..949692f 100644 --- a/go.mod +++ b/go.mod @@ -3,20 +3,3 @@ module github.com/lehigh-university-libraries/fabricator go 1.22.2 require github.com/lehigh-university-libraries/go-islandora v0.0.0-20240709193244-50f8e60d633d - -require ( - github.com/getkin/kin-openapi v0.125.0 // indirect - github.com/go-openapi/jsonpointer v0.20.2 // indirect - github.com/go-openapi/swag v0.22.8 // indirect - github.com/invopop/yaml v0.2.0 // indirect - github.com/josharian/intern v1.0.0 // indirect - github.com/mailru/easyjson v0.7.7 // indirect - github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect - github.com/oapi-codegen/oapi-codegen/v2 v2.3.1-0.20240628202753-01d615601570 - github.com/perimeterx/marshmallow v1.1.5 // indirect - golang.org/x/mod v0.18.0 // indirect - golang.org/x/text v0.15.0 // indirect - golang.org/x/tools v0.22.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) diff --git a/go.sum b/go.sum index ab61ec3..a87f394 100644 --- a/go.sum +++ b/go.sum @@ -1,52 +1,2 @@ -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/getkin/kin-openapi v0.125.0 h1:jyQCyf2qXS1qvs2U00xQzkGCqYPhEhZDmSmVt65fXno= -github.com/getkin/kin-openapi v0.125.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM= -github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= -github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs= -github.com/go-openapi/swag v0.22.8 h1:/9RjDSQ0vbFR+NyjGMkFTsA1IA0fmhKSThmfGZjicbw= -github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI= -github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= -github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= -github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY= -github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= -github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lehigh-university-libraries/go-islandora v0.0.0-20240709193244-50f8e60d633d h1:bryeojGZvWZazzCdVsZB0Pi3LijX/Aq82KgDnjPkt0s= github.com/lehigh-university-libraries/go-islandora v0.0.0-20240709193244-50f8e60d633d/go.mod h1:JDCARba/UJW608jcs6XyVuCsfp3LoDVDC++bnGAB47A= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/oapi-codegen/oapi-codegen/v2 v2.3.1-0.20240628202753-01d615601570 h1:PyI+bC4AYdSpWLfxL6I4nHfMQgwWQedTERq/Zx24coI= -github.com/oapi-codegen/oapi-codegen/v2 v2.3.1-0.20240628202753-01d615601570/go.mod h1:GeP1OtSNbkWFK9i3VWfXAkV0JIaZYRpsg3KNrEQQFj4= -github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= -github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= -github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tools.go b/tools.go deleted file mode 100644 index 35e0f39..0000000 --- a/tools.go +++ /dev/null @@ -1,8 +0,0 @@ -//go:build tools -// +build tools - -package main - -import ( - _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" -)