diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7388234..01a4d04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,15 +7,14 @@ on: jobs: test: runs-on: ubuntu-latest - strategy: - matrix: - go: [ '1.21' ] steps: - uses: actions/checkout@v4 - name: Setup go uses: actions/setup-go@v5 with: - go-version: ${{ matrix.go }} + go-version-file: go.mod + check-latest: true + cache: true - name: Run tests run: | make test diff --git a/.github/workflows/scheduled-update-client.yml b/.github/workflows/scheduled-update-client.yml index c943491..bd7e4c9 100644 --- a/.github/workflows/scheduled-update-client.yml +++ b/.github/workflows/scheduled-update-client.yml @@ -11,7 +11,9 @@ jobs: - name: Setup go uses: actions/setup-go@v5 with: - go-version-file: 'go.mod' + go-version-file: go.mod + check-latest: true + cache: true - run: make fetch-openapi - run: make generate - name: Create Pull Request diff --git a/Makefile b/Makefile index cc1af5d..f257c91 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ fetch-openapi: curl -fsSL https://api-docs.humanitec.com/openapi.json > ./docs/openapi.json generate: - go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.0.0 -generate types,client -package client ./docs/openapi.json > client/client.gen.go + go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.4.1 -generate types,client -package client ./docs/openapi.json > client/client.gen.go test: go test ./... -cover diff --git a/client/client.gen.go b/client/client.gen.go index 2b8fce8..7e9219c 100644 --- a/client/client.gen.go +++ b/client/client.gen.go @@ -1,6 +1,6 @@ // Package client provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.4.1 DO NOT EDIT. package client import ( @@ -4371,7 +4371,7 @@ func (t *ArtefactVersion) MergeContainerArtefactVersion(v ContainerArtefactVersi return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -4401,7 +4401,7 @@ func (t *ArtefactVersion) MergeWorkloadArtefactVersion(v WorkloadArtefactVersion return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -4497,7 +4497,7 @@ func (t *CreateArtefactVersion) MergeCreateContainerArtefactVersion(v CreateCont return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -4527,7 +4527,7 @@ func (t *CreateArtefactVersion) MergeCreateWorkloadArtefactVersion(v CreateWorkl return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -4623,7 +4623,7 @@ func (t *PipelineCriteria) MergePipelineDeploymentRequestCriteria(v PipelineDepl return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -4753,7 +4753,7 @@ func (t *PipelineCriteriaCreateBody) MergePipelineDeploymentRequestCriteriaCreat return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -4847,7 +4847,7 @@ func (t *PipelineRunCreateByTriggerCriteriaBody) MergePipelineRunCreateByDeploym return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -22245,6 +22245,7 @@ type PostOrgsOrgIdAppsAppIdDeltasResponse struct { } JSON400 *HumanitecErrorResponse } +type PostOrgsOrgIdAppsAppIdDeltas2000 = string // Status returns HTTPResponse.Status func (r PostOrgsOrgIdAppsAppIdDeltasResponse) Status() string { diff --git a/go.mod b/go.mod index 79b4a98..7d967b6 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/humanitec/humanitec-go-autogen -go 1.21 +go 1.23 -toolchain go1.21.5 +toolchain go1.23.2 require ( github.com/oapi-codegen/runtime v1.1.1 @@ -13,7 +13,7 @@ require ( require ( github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/google/uuid v1.5.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect diff --git a/go.sum b/go.sum index 49460a6..3d27f73 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,8 @@ github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvF github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=