From 3f27d02f505e3890f2b20358f40c5d1b5e603fa5 Mon Sep 17 00:00:00 2001 From: Oleg Balunenko Date: Tue, 2 Jun 2026 04:31:56 +0400 Subject: [PATCH] feat: Update API to latest --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/go.yml | 2 +- Makefile | 4 +- docs/swagger.json | 9 +- go.mod | 15 +- go.sum | 30 +- .../client/activities/activities_client.go | 3 - .../activities/create_activity_parameters.go | 5 +- .../activities/create_activity_responses.go | 5 +- .../get_activity_by_id_parameters.go | 6 +- .../get_activity_by_id_responses.go | 5 +- .../get_comments_by_activity_id_parameters.go | 9 +- .../get_comments_by_activity_id_responses.go | 5 +- .../get_kudoers_by_activity_id_parameters.go | 11 +- .../get_kudoers_by_activity_id_responses.go | 5 +- .../get_laps_by_activity_id_parameters.go | 5 +- .../get_laps_by_activity_id_responses.go | 5 +- ...logged_in_athlete_activities_parameters.go | 13 +- ..._logged_in_athlete_activities_responses.go | 5 +- .../get_zones_by_activity_id_parameters.go | 5 +- .../get_zones_by_activity_id_responses.go | 5 +- .../update_activity_by_id_parameters.go | 5 +- .../update_activity_by_id_responses.go | 5 +- .../client/athletes/athletes_client.go | 3 - .../get_logged_in_athlete_parameters.go | 4 +- .../get_logged_in_athlete_responses.go | 5 +- .../get_logged_in_athlete_zones_parameters.go | 4 +- .../get_logged_in_athlete_zones_responses.go | 5 +- .../client/athletes/get_stats_parameters.go | 5 +- .../client/athletes/get_stats_responses.go | 5 +- .../update_logged_in_athlete_parameters.go | 5 +- .../update_logged_in_athlete_responses.go | 5 +- .../client/clubs/clubs_client.go | 3 - .../get_club_activities_by_id_parameters.go | 11 +- .../get_club_activities_by_id_responses.go | 5 +- .../clubs/get_club_admins_by_id_parameters.go | 11 +- .../clubs/get_club_admins_by_id_responses.go | 5 +- .../client/clubs/get_club_by_id_parameters.go | 5 +- .../client/clubs/get_club_by_id_responses.go | 5 +- .../get_club_members_by_id_parameters.go | 11 +- .../clubs/get_club_members_by_id_responses.go | 5 +- .../get_logged_in_athlete_clubs_parameters.go | 11 +- .../get_logged_in_athlete_clubs_responses.go | 5 +- .../client/gears/gears_client.go | 3 - .../client/gears/get_gear_by_id_parameters.go | 5 +- .../client/gears/get_gear_by_id_responses.go | 5 +- .../routes/get_route_as_g_p_x_parameters.go | 5 +- .../routes/get_route_as_g_p_x_responses.go | 8 +- .../routes/get_route_as_t_c_x_parameters.go | 5 +- .../routes/get_route_as_t_c_x_responses.go | 8 +- .../routes/get_route_by_id_parameters.go | 5 +- .../routes/get_route_by_id_responses.go | 5 +- .../get_routes_by_athlete_id_parameters.go | 11 +- .../get_routes_by_athlete_id_responses.go | 5 +- .../client/routes/routes_client.go | 3 - .../get_efforts_by_segment_id_parameters.go | 13 +- .../get_efforts_by_segment_id_responses.go | 5 +- .../get_segment_effort_by_id_parameters.go | 5 +- .../get_segment_effort_by_id_responses.go | 5 +- .../segment_efforts/segment_efforts_client.go | 3 - .../segments/explore_segments_parameters.go | 8 +- .../segments/explore_segments_responses.go | 5 +- ..._in_athlete_starred_segments_parameters.go | 11 +- ...d_in_athlete_starred_segments_responses.go | 5 +- .../segments/get_segment_by_id_parameters.go | 5 +- .../segments/get_segment_by_id_responses.go | 5 +- .../client/segments/segments_client.go | 3 - .../segments/star_segment_parameters.go | 9 +- .../client/segments/star_segment_responses.go | 5 +- .../client/strava_api_v3_client.go | 3 - .../get_activity_streams_parameters.go | 10 +- .../streams/get_activity_streams_responses.go | 5 +- .../streams/get_route_streams_parameters.go | 5 +- .../streams/get_route_streams_responses.go | 5 +- .../get_segment_effort_streams_parameters.go | 10 +- .../get_segment_effort_streams_responses.go | 5 +- .../streams/get_segment_streams_parameters.go | 10 +- .../streams/get_segment_streams_responses.go | 5 +- .../client/streams/streams_client.go | 3 - .../uploads/create_upload_parameters.go | 6 +- .../client/uploads/create_upload_responses.go | 5 +- .../uploads/get_upload_by_id_parameters.go | 5 +- .../uploads/get_upload_by_id_responses.go | 5 +- .../client/uploads/uploads_client.go | 3 - .../strava-api-go/models/activity_stats.go | 13 +- .../strava-api-go/models/activity_total.go | 4 +- .../gen/strava-api-go/models/activity_type.go | 3 - .../gen/strava-api-go/models/activity_zone.go | 5 +- .../strava-api-go/models/altitude_stream.go | 3 - .../gen/strava-api-go/models/base_stream.go | 4 +- .../strava-api-go/models/cadence_stream.go | 3 - .../gen/strava-api-go/models/club_activity.go | 7 +- .../gen/strava-api-go/models/club_athlete.go | 4 +- internal/gen/strava-api-go/models/comment.go | 5 +- .../strava-api-go/models/comment_athlete.go | 6 +- .../strava-api-go/models/detailed_activity.go | 45 +- ...led_activity_all_of1_best_efforts_items.go | 11 +- .../strava-api-go/models/detailed_athlete.go | 16 +- .../gen/strava-api-go/models/detailed_club.go | 4 +- .../models/detailed_club_all_of0.go | 8 +- .../gen/strava-api-go/models/detailed_gear.go | 3 - .../strava-api-go/models/detailed_segment.go | 7 +- .../models/detailed_segment_all_of0.go | 8 +- .../models/detailed_segment_effort.go | 11 +- .../strava-api-go/models/distance_stream.go | 3 - internal/gen/strava-api-go/models/error.go | 4 +- .../strava-api-go/models/explorer_response.go | 7 +- .../strava-api-go/models/explorer_segment.go | 6 +- internal/gen/strava-api-go/models/fault.go | 7 +- .../models/heart_rate_details.go | 4 +- .../models/heart_rate_zone_ranges.go | 5 +- .../strava-api-go/models/heartrate_stream.go | 3 - internal/gen/strava-api-go/models/lap.go | 6 +- internal/gen/strava-api-go/models/lat_lng.go | 3 - .../strava-api-go/models/lat_lng_stream.go | 9 +- .../gen/strava-api-go/models/meta_activity.go | 4 +- .../gen/strava-api-go/models/meta_athlete.go | 4 +- .../gen/strava-api-go/models/meta_club.go | 4 +- .../gen/strava-api-go/models/moving_stream.go | 3 - .../strava-api-go/models/photos_summary.go | 6 +- .../gen/strava-api-go/models/polyline_map.go | 4 +- .../gen/strava-api-go/models/power_stream.go | 3 - .../strava-api-go/models/power_zone_ranges.go | 5 +- internal/gen/strava-api-go/models/route.go | 12 +- .../models/smooth_grade_stream.go | 3 - .../models/smooth_velocity_stream.go | 3 - internal/gen/strava-api-go/models/split.go | 4 +- .../gen/strava-api-go/models/sport_type.go | 23 +- .../gen/strava-api-go/models/stream_set.go | 15 +- .../strava-api-go/models/summary_activity.go | 18 +- .../strava-api-go/models/summary_athlete.go | 6 +- .../gen/strava-api-go/models/summary_club.go | 8 +- .../gen/strava-api-go/models/summary_gear.go | 4 +- .../models/summary_p_r_segment_effort.go | 4 +- .../strava-api-go/models/summary_segment.go | 8 +- .../models/summary_segment_effort.go | 4 +- .../models/temperature_stream.go | 3 - .../gen/strava-api-go/models/time_stream.go | 3 - .../models/timed_zone_distribution.go | 5 +- .../strava-api-go/models/timed_zone_range.go | 3 - .../models/updatable_activity.go | 6 +- internal/gen/strava-api-go/models/upload.go | 4 +- internal/gen/strava-api-go/models/waypoint.go | 8 +- .../gen/strava-api-go/models/zone_range.go | 4 +- .../gen/strava-api-go/models/zone_ranges.go | 5 +- internal/gen/strava-api-go/models/zones.go | 6 +- scripts/style/fmt.sh | 4 +- .../github.com/go-openapi/analysis/.gitignore | 2 + .../go-openapi/analysis/CONTRIBUTORS.md | 29 +- .../github.com/go-openapi/analysis/README.md | 3 +- .../go-openapi/analysis/analyzer.go | 41 +- .../github.com/go-openapi/analysis/flatten.go | 1 + .../go-openapi/analysis/flatten_name.go | 4 +- .../go-openapi/analysis/flatten_options.go | 14 +- .../go-openapi/analysis/go.work.sum | 47 -- .../github.com/go-openapi/analysis/mixin.go | 71 ++- .../github.com/go-openapi/analysis/options.go | 21 + .../go-openapi/jsonreference/.gitignore | 1 - .../go-openapi/jsonreference/CONTRIBUTORS.md | 22 +- .../go-openapi/jsonreference/README.md | 22 +- .../go-openapi/strfmt/CONTRIBUTORS.md | 4 +- .../go-openapi/validate/CONTRIBUTORS.md | 6 +- .../github.com/go-openapi/validate/README.md | 2 +- .../github.com/obalunenko/getenv/.gitignore | 5 +- .../obalunenko/getenv/.golangci.pipe.yml | 203 +++----- .../obalunenko/getenv/.golangci.yml | 481 ++++++------------ vendor/github.com/obalunenko/getenv/Makefile | 2 +- vendor/github.com/obalunenko/getenv/README.md | 1 + vendor/github.com/obalunenko/getenv/getenv.go | 5 + .../obalunenko/getenv/internal/constraint.go | 26 +- .../obalunenko/getenv/internal/iface.go | 42 +- .../obalunenko/getenv/internal/parsers.go | 162 +++--- .../obalunenko/getenv/linters-report.xml | 3 - vendor/golang.org/x/exp/LICENSE | 27 - vendor/golang.org/x/exp/PATENTS | 22 - .../x/exp/constraints/constraints.go | 52 -- vendor/modules.txt | 21 +- 177 files changed, 1022 insertions(+), 1265 deletions(-) delete mode 100644 vendor/github.com/go-openapi/analysis/go.work.sum create mode 100644 vendor/github.com/go-openapi/analysis/options.go delete mode 100644 vendor/github.com/obalunenko/getenv/linters-report.xml delete mode 100644 vendor/golang.org/x/exp/LICENSE delete mode 100644 vendor/golang.org/x/exp/PATENTS delete mode 100644 vendor/golang.org/x/exp/constraints/constraints.go diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fc2ca84..72828a4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -34,7 +34,7 @@ jobs: matrix: language: [ 'go' ] os: [ 'ubuntu-24.04' ] - go-version: [1.25.x] + go-version: [1.26.x] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] # Learn more about CodeQL language support at https://git.io/codeql-language-support diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 4f3f99f..f11181e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -42,7 +42,7 @@ jobs: max-parallel: 3 matrix: os: [ 'ubuntu-24.04' ] - go-version: [1.25.x] + go-version: [1.26.x] runs-on: ${{ matrix.os }} name: Build steps: diff --git a/Makefile b/Makefile index dd02bd0..6e9a231 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ COMPOSE_TOOLS_CMD_BASE=docker compose -f $(COMPOSE_TOOLS_FILE) COMPOSE_TOOLS_CMD_UP=$(COMPOSE_TOOLS_CMD_BASE) up --exit-code-from COMPOSE_TOOLS_CMD_PULL=$(COMPOSE_TOOLS_CMD_BASE) build -GOVERSION:=1.25 +GOVERSION:=1.26 TARGET_MAX_CHAR_NUM=20 @@ -79,7 +79,7 @@ bump-go-version: .PHONY: bump-go-version update-swagger-spec: - swagger flatten --format=json --with-flatten=minimal --output=./docs/swagger.json $(API_DOC_URL) + go run github.com/go-swagger/go-swagger/cmd/swagger@latest flatten --format=json --with-flatten=minimal --output=./docs/swagger.json $(API_DOC_URL) .PHONY: update-swagger-spec diff --git a/docs/swagger.json b/docs/swagger.json index 30b487f..a7f2b67 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -4572,8 +4572,11 @@ "AlpineSki", "BackcountrySki", "Badminton", + "Basketball", "Canoeing", + "Cricket", "Crossfit", + "Dance", "EBikeRide", "Elliptical", "EMountainBikeRide", @@ -4588,6 +4591,8 @@ "Kitesurf", "MountainBikeRide", "NordicSki", + "Padel", + "PhysicalTherapy", "Pickleball", "Pilates", "Racquetball", @@ -4613,6 +4618,7 @@ "VirtualRide", "VirtualRow", "VirtualRun", + "Volleyball", "Walk", "WeightTraining", "Wheelchair", @@ -5295,7 +5301,8 @@ }, "distance_into_route": { "description": "The number meters along the route that the waypoint is located", - "type": "integer" + "type": "number", + "format": "float" }, "latlng": { "$ref": "#/definitions/latLng" diff --git a/go.mod b/go.mod index 66c7c3c..6cb182f 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ module github.com/obalunenko/strava-api -go 1.25.0 +go 1.26.2 require ( github.com/go-openapi/errors v0.22.7 github.com/go-openapi/runtime v0.32.2 - github.com/go-openapi/strfmt v0.26.2 + github.com/go-openapi/strfmt v0.26.3 github.com/go-openapi/swag v0.26.0 - github.com/go-openapi/validate v0.25.2 - github.com/obalunenko/getenv v1.14.1 + github.com/go-openapi/validate v0.25.3 + github.com/obalunenko/getenv v1.14.2 github.com/stretchr/testify v1.11.1 ) @@ -17,9 +17,9 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-openapi/analysis v0.25.0 // indirect + github.com/go-openapi/analysis v0.25.1 // indirect github.com/go-openapi/jsonpointer v0.23.1 // indirect - github.com/go-openapi/jsonreference v0.21.5 // indirect + github.com/go-openapi/jsonreference v0.21.6 // indirect github.com/go-openapi/loads v0.23.3 // indirect github.com/go-openapi/runtime/server-middleware v0.30.0 // indirect github.com/go-openapi/spec v0.22.4 // indirect @@ -43,8 +43,7 @@ require ( go.opentelemetry.io/otel/metric v1.43.0 // indirect go.opentelemetry.io/otel/trace v1.43.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect - golang.org/x/net v0.54.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/sync v0.20.0 // indirect golang.org/x/text v0.37.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index ba9522c..1043a1b 100644 --- a/go.sum +++ b/go.sum @@ -7,14 +7,14 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-openapi/analysis v0.25.0 h1:EnjAq1yO8wEO9HbPmY8vLPEIkdZuuFhCAKBPvCB7bCs= -github.com/go-openapi/analysis v0.25.0/go.mod h1:5WFTRE43WLkPG9r9OtlMfqkkvUTYLVVCIxLlEpyF8kE= +github.com/go-openapi/analysis v0.25.1 h1:We0FXVvCY5XNSb8GrE+k+wsgkUqTJqnkqsVAC9EGdrM= +github.com/go-openapi/analysis v0.25.1/go.mod h1:/S7h3rOOTHDGoPwyyjTGQpGeLKxWecr8QWSBdE68UgM= github.com/go-openapi/errors v0.22.7 h1:JLFBGC0Apwdzw3484MmBqspjPbwa2SHvpDm0u5aGhUA= github.com/go-openapi/errors v0.22.7/go.mod h1://QW6SD9OsWtH6gHllUCddOXDL0tk0ZGNYHwsw4sW3w= github.com/go-openapi/jsonpointer v0.23.1 h1:1HBACs7XIwR2RcmItfdSFlALhGbe6S92p0ry4d1GWg4= github.com/go-openapi/jsonpointer v0.23.1/go.mod h1:iWRmZTrGn7XwYhtPt/fvdSFj1OfNBngqRT2UG3BxSqY= -github.com/go-openapi/jsonreference v0.21.5 h1:6uCGVXU/aNF13AQNggxfysJ+5ZcU4nEAe+pJyVWRdiE= -github.com/go-openapi/jsonreference v0.21.5/go.mod h1:u25Bw85sX4E2jzFodh1FOKMTZLcfifd1Q+iKKOUxExw= +github.com/go-openapi/jsonreference v0.21.6 h1:NZ5nGfnaM1n4I43Xjm1e5/M2GjOwQwndQz22uhxwD+Y= +github.com/go-openapi/jsonreference v0.21.6/go.mod h1:xzbgtQ3ZbWxvET3AxdzCJlJt6vkovbf+IfSPJjD0tUY= github.com/go-openapi/loads v0.23.3 h1:g5Xap1JfwKkUnZdn+S0L3SzBDpcTIYzZ5Qaag0YDkKQ= github.com/go-openapi/loads v0.23.3/go.mod h1:NOH07zLajXo8y55hom0omlHWDVVvCwBM/S+csCK8LqA= github.com/go-openapi/runtime v0.32.2 h1:X9mZz716lFwYZ6bFV1BBnthNdHTy46zKM5Em4D1UISI= @@ -23,8 +23,8 @@ github.com/go-openapi/runtime/server-middleware v0.30.0 h1:8rPoJ/xv7JL8BsovaqboK github.com/go-openapi/runtime/server-middleware v0.30.0/go.mod h1:OYNT/TxNvB/VK5oe4htM2jDTwlEXuejVJmu0DVZfAMs= github.com/go-openapi/spec v0.22.4 h1:4pxGjipMKu0FzFiu/DPwN3CTBRlVM2yLf/YTWorYfDQ= github.com/go-openapi/spec v0.22.4/go.mod h1:WQ6Ai0VPWMZgMT4XySjlRIE6GP1bGQOtEThn3gcWLtQ= -github.com/go-openapi/strfmt v0.26.2 h1:ysjheCh4i1rmFEo2LanhELDNucNzfWTZhUDKgWWPaFM= -github.com/go-openapi/strfmt v0.26.2/go.mod h1:fXh1e449cyUn2NYuz+wb3wARBUdMl7qPEZwX00nqivY= +github.com/go-openapi/strfmt v0.26.3 h1:rzmslHarJgBbf2qfGge+X3htclQfmXqBZMm0Too0HhU= +github.com/go-openapi/strfmt v0.26.3/go.mod h1:a5nsUw0oRpQzZeOwx8bi6cKbzFZslpbCKt1LEot+KnQ= github.com/go-openapi/swag v0.26.0 h1:GVDXCmfvhfu1BxiHo8/FA+BbKmhecHnG3varjON5/RI= github.com/go-openapi/swag v0.26.0/go.mod h1:82g3193sZJRbocs7bNCqGfIgq8pkuwVwCfhKIRlEQF0= github.com/go-openapi/swag/cmdutils v0.26.0 h1:iowihOcvq7y4egO8cOq0dmfohz6wfeQ63U1EnuhO2TU= @@ -55,8 +55,8 @@ github.com/go-openapi/testify/enable/yaml/v2 v2.5.1 h1:q9NtHwK4qHF7yZziBPvZyv7zW github.com/go-openapi/testify/enable/yaml/v2 v2.5.1/go.mod h1:JW0MXIotCYps/XsgJnG3a8Q7rE5xAiBwoOD5OfaIQBk= github.com/go-openapi/testify/v2 v2.5.1 h1:TMdhCaw8fUNraVSf3Omoob1dO/AzBfhtFAPW0an6sBo= github.com/go-openapi/testify/v2 v2.5.1/go.mod h1:SgsVHtfooshd0tublTtJ50FPKhujf47YRqauXXOUxfw= -github.com/go-openapi/validate v0.25.2 h1:12NsfLAwGegqbGWr2CnvT65X/Q2USJipmJ9b7xDJZz0= -github.com/go-openapi/validate v0.25.2/go.mod h1:Pgl1LpPPGFnZ+ys4/hTlDiRYQdI1ocKypgE+8Q8BLfY= +github.com/go-openapi/validate v0.25.3 h1:4nzAIavcJ7WveHK2+V1UAkZK3kWcjzxZCzjfZAfavKs= +github.com/go-openapi/validate v0.25.3/go.mod h1:GemfuGMyYpIaBoKpX3z8sLywrmxpzWVOoJ7R0VeAVuk= github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro= github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= @@ -67,8 +67,8 @@ 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/obalunenko/getenv v1.14.1 h1:nFwG6PMKWKNBWnvlCbIOLgYdj/sSerbLZ9k3Is26HOU= -github.com/obalunenko/getenv v1.14.1/go.mod h1:O+JIpb//raW/4Mx6sno6lHckuFn7zbagod0KkyDHUX0= +github.com/obalunenko/getenv v1.14.2 h1:TDYbrAOscHaL6Qw5iG3QYE1Lhigk0TSv2GHe370XkxM= +github.com/obalunenko/getenv v1.14.2/go.mod h1:kXJjGqFmvucspwNk4/hrHi2bG3cEfSEQJPYmWzUK/KQ= github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= @@ -90,14 +90,12 @@ go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09 go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa h1:t2QcU6V556bFjYgu4L6C+6VrCPyJZ+eyRsABUPs1mz4= -golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk= -golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w= -golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ= -golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/gen/strava-api-go/client/activities/activities_client.go b/internal/gen/strava-api-go/client/activities/activities_client.go index eebca21..5053dd5 100644 --- a/internal/gen/strava-api-go/client/activities/activities_client.go +++ b/internal/gen/strava-api-go/client/activities/activities_client.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/client/activities/create_activity_parameters.go b/internal/gen/strava-api-go/client/activities/create_activity_parameters.go index 6ed4e48..b61d7e6 100644 --- a/internal/gen/strava-api-go/client/activities/create_activity_parameters.go +++ b/internal/gen/strava-api-go/client/activities/create_activity_parameters.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ CreateActivityParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type CreateActivityParams struct { + /* Commute. Set to 1 to mark as commute. @@ -273,6 +271,7 @@ func (o *CreateActivityParams) SetType(typeVar *string) { // WriteToRequest writes these params to a swagger request func (o *CreateActivityParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/create_activity_responses.go b/internal/gen/strava-api-go/client/activities/create_activity_responses.go index 6bd4c97..f9dd698 100644 --- a/internal/gen/strava-api-go/client/activities/create_activity_responses.go +++ b/internal/gen/strava-api-go/client/activities/create_activity_responses.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *CreateActivityCreated) GetPayload() *models.DetailedActivity { } func (o *CreateActivityCreated) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedActivity) // response payload @@ -175,6 +173,7 @@ func (o *CreateActivityDefault) GetPayload() *models.Fault { } func (o *CreateActivityDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/activities/get_activity_by_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_activity_by_id_parameters.go index 93fe31d..7d2c537 100644 --- a/internal/gen/strava-api-go/client/activities/get_activity_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_activity_by_id_parameters.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetActivityByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetActivityByIDParams struct { + /* ID. The identifier of the activity. @@ -152,6 +150,7 @@ func (o *GetActivityByIDParams) SetIncludeAllEfforts(includeAllEfforts *bool) { // WriteToRequest writes these params to a swagger request func (o *GetActivityByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -172,6 +171,7 @@ func (o *GetActivityByIDParams) WriteToRequest(r runtime.ClientRequest, reg strf } qIncludeAllEfforts := swag.FormatBool(qrIncludeAllEfforts) if qIncludeAllEfforts != "" { + if err := r.SetQueryParam("include_all_efforts", qIncludeAllEfforts); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_activity_by_id_responses.go b/internal/gen/strava-api-go/client/activities/get_activity_by_id_responses.go index b1b7e57..6f0e1eb 100644 --- a/internal/gen/strava-api-go/client/activities/get_activity_by_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_activity_by_id_responses.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetActivityByIDOK) GetPayload() *models.DetailedActivity { } func (o *GetActivityByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedActivity) // response payload @@ -175,6 +173,7 @@ func (o *GetActivityByIDDefault) GetPayload() *models.Fault { } func (o *GetActivityByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_parameters.go index 6d6538f..aca8594 100644 --- a/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_parameters.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetCommentsByActivityIDParams contains all the parameters to send to the API end Typically these are written to a http.Request. */ type GetCommentsByActivityIDParams struct { + /* AfterCursor. Cursor of the last item in the previous page of results, used to request the subsequent page of results. When omitted, the first page of results is fetched. @@ -221,6 +219,7 @@ func (o *GetCommentsByActivityIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -236,6 +235,7 @@ func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, } qAfterCursor := qrAfterCursor if qAfterCursor != "" { + if err := r.SetQueryParam("after_cursor", qAfterCursor); err != nil { return err } @@ -257,6 +257,7 @@ func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, } qPage := swag.FormatInt64(qrPage) if qPage != "" { + if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -273,6 +274,7 @@ func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, } qPageSize := swag.FormatInt64(qrPageSize) if qPageSize != "" { + if err := r.SetQueryParam("page_size", qPageSize); err != nil { return err } @@ -289,6 +291,7 @@ func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_responses.go b/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_responses.go index 44861b1..0732dec 100644 --- a/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_responses.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetCommentsByActivityIDOK) GetPayload() []*models.Comment { } func (o *GetCommentsByActivityIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetCommentsByActivityIDDefault) GetPayload() *models.Fault { } func (o *GetCommentsByActivityIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_parameters.go index 8607e55..81983ec 100644 --- a/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_parameters.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetKudoersByActivityIDParams contains all the parameters to send to the API endp Typically these are written to a http.Request. */ type GetKudoersByActivityIDParams struct { + /* ID. The identifier of the activity. @@ -100,7 +98,9 @@ func (o *GetKudoersByActivityIDParams) WithDefaults() *GetKudoersByActivityIDPar // // All values with no default are reset to their zero value. func (o *GetKudoersByActivityIDParams) SetDefaults() { - perPageDefault := int64(30) + var ( + perPageDefault = int64(30) + ) val := GetKudoersByActivityIDParams{ PerPage: &perPageDefault, @@ -180,6 +180,7 @@ func (o *GetKudoersByActivityIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetKudoersByActivityIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -200,6 +201,7 @@ func (o *GetKudoersByActivityIDParams) WriteToRequest(r runtime.ClientRequest, r } qPage := swag.FormatInt64(qrPage) if qPage != "" { + if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -216,6 +218,7 @@ func (o *GetKudoersByActivityIDParams) WriteToRequest(r runtime.ClientRequest, r } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_responses.go b/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_responses.go index 3f3bab4..4cb9dd6 100644 --- a/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_responses.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetKudoersByActivityIDOK) GetPayload() []*models.SummaryAthlete { } func (o *GetKudoersByActivityIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetKudoersByActivityIDDefault) GetPayload() *models.Fault { } func (o *GetKudoersByActivityIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_parameters.go index a1dd8d1..d25e211 100644 --- a/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_parameters.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetLapsByActivityIDParams contains all the parameters to send to the API endpoin Typically these are written to a http.Request. */ type GetLapsByActivityIDParams struct { + /* ID. The identifier of the activity. @@ -135,6 +133,7 @@ func (o *GetLapsByActivityIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetLapsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_responses.go b/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_responses.go index aebbb1b..d60a069 100644 --- a/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_responses.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetLapsByActivityIDOK) GetPayload() []*models.Lap { } func (o *GetLapsByActivityIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetLapsByActivityIDDefault) GetPayload() *models.Fault { } func (o *GetLapsByActivityIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_parameters.go b/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_parameters.go index d4106d4..b225b67 100644 --- a/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_parameters.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetLoggedInAthleteActivitiesParams contains all the parameters to send to the AP Typically these are written to a http.Request. */ type GetLoggedInAthleteActivitiesParams struct { + /* After. An epoch timestamp to use for filtering activities that have taken place after a certain time. @@ -104,7 +102,9 @@ func (o *GetLoggedInAthleteActivitiesParams) WithDefaults() *GetLoggedInAthleteA // // All values with no default are reset to their zero value. func (o *GetLoggedInAthleteActivitiesParams) SetDefaults() { - perPageDefault := int64(30) + var ( + perPageDefault = int64(30) + ) val := GetLoggedInAthleteActivitiesParams{ PerPage: &perPageDefault, @@ -195,6 +195,7 @@ func (o *GetLoggedInAthleteActivitiesParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -210,6 +211,7 @@ func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequ } qAfter := swag.FormatInt64(qrAfter) if qAfter != "" { + if err := r.SetQueryParam("after", qAfter); err != nil { return err } @@ -226,6 +228,7 @@ func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequ } qBefore := swag.FormatInt64(qrBefore) if qBefore != "" { + if err := r.SetQueryParam("before", qBefore); err != nil { return err } @@ -242,6 +245,7 @@ func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequ } qPage := swag.FormatInt64(qrPage) if qPage != "" { + if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -258,6 +262,7 @@ func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequ } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_responses.go b/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_responses.go index 194e929..eb6cbfe 100644 --- a/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_responses.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetLoggedInAthleteActivitiesOK) GetPayload() []*models.SummaryActivity } func (o *GetLoggedInAthleteActivitiesOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetLoggedInAthleteActivitiesDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteActivitiesDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_parameters.go index 1e2be99..41d9e93 100644 --- a/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_parameters.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetZonesByActivityIDParams contains all the parameters to send to the API endpoi Typically these are written to a http.Request. */ type GetZonesByActivityIDParams struct { + /* ID. The identifier of the activity. @@ -135,6 +133,7 @@ func (o *GetZonesByActivityIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetZonesByActivityIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_responses.go b/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_responses.go index 39bcc9d..0f3e97e 100644 --- a/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_responses.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetZonesByActivityIDOK) GetPayload() []*models.ActivityZone { } func (o *GetZonesByActivityIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetZonesByActivityIDDefault) GetPayload() *models.Fault { } func (o *GetZonesByActivityIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/activities/update_activity_by_id_parameters.go b/internal/gen/strava-api-go/client/activities/update_activity_by_id_parameters.go index 4a314c9..ac55521 100644 --- a/internal/gen/strava-api-go/client/activities/update_activity_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/update_activity_by_id_parameters.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -63,6 +60,7 @@ UpdateActivityByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type UpdateActivityByIDParams struct { + // Body. Body *models.UpdatableActivity @@ -151,6 +149,7 @@ func (o *UpdateActivityByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *UpdateActivityByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/update_activity_by_id_responses.go b/internal/gen/strava-api-go/client/activities/update_activity_by_id_responses.go index 5df3533..d2ec5cd 100644 --- a/internal/gen/strava-api-go/client/activities/update_activity_by_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/update_activity_by_id_responses.go @@ -2,9 +2,6 @@ package activities -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *UpdateActivityByIDOK) GetPayload() *models.DetailedActivity { } func (o *UpdateActivityByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedActivity) // response payload @@ -175,6 +173,7 @@ func (o *UpdateActivityByIDDefault) GetPayload() *models.Fault { } func (o *UpdateActivityByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/athletes/athletes_client.go b/internal/gen/strava-api-go/client/athletes/athletes_client.go index 2d4a776..b49ea95 100644 --- a/internal/gen/strava-api-go/client/athletes/athletes_client.go +++ b/internal/gen/strava-api-go/client/athletes/athletes_client.go @@ -2,9 +2,6 @@ package athletes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_parameters.go b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_parameters.go index 808cc27..c2c8711 100644 --- a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_parameters.go +++ b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_parameters.go @@ -2,9 +2,6 @@ package athletes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -115,6 +112,7 @@ func (o *GetLoggedInAthleteParams) SetHTTPClient(client *http.Client) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_responses.go b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_responses.go index 836e193..73a8bef 100644 --- a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_responses.go +++ b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_responses.go @@ -2,9 +2,6 @@ package athletes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetLoggedInAthleteOK) GetPayload() *models.DetailedAthlete { } func (o *GetLoggedInAthleteOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedAthlete) // response payload @@ -175,6 +173,7 @@ func (o *GetLoggedInAthleteDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_parameters.go b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_parameters.go index ccfd9d4..32800ae 100644 --- a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_parameters.go +++ b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_parameters.go @@ -2,9 +2,6 @@ package athletes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -115,6 +112,7 @@ func (o *GetLoggedInAthleteZonesParams) SetHTTPClient(client *http.Client) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteZonesParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_responses.go b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_responses.go index ecad60c..a93e7fe 100644 --- a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_responses.go +++ b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_responses.go @@ -2,9 +2,6 @@ package athletes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetLoggedInAthleteZonesOK) GetPayload() *models.Zones { } func (o *GetLoggedInAthleteZonesOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Zones) // response payload @@ -175,6 +173,7 @@ func (o *GetLoggedInAthleteZonesDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteZonesDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/athletes/get_stats_parameters.go b/internal/gen/strava-api-go/client/athletes/get_stats_parameters.go index 58eaee7..20392c6 100644 --- a/internal/gen/strava-api-go/client/athletes/get_stats_parameters.go +++ b/internal/gen/strava-api-go/client/athletes/get_stats_parameters.go @@ -2,9 +2,6 @@ package athletes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetStatsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetStatsParams struct { + /* ID. The identifier of the athlete. Must match the authenticated athlete. @@ -135,6 +133,7 @@ func (o *GetStatsParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetStatsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/athletes/get_stats_responses.go b/internal/gen/strava-api-go/client/athletes/get_stats_responses.go index 5433f3a..d41ecb7 100644 --- a/internal/gen/strava-api-go/client/athletes/get_stats_responses.go +++ b/internal/gen/strava-api-go/client/athletes/get_stats_responses.go @@ -2,9 +2,6 @@ package athletes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetStatsOK) GetPayload() *models.ActivityStats { } func (o *GetStatsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.ActivityStats) // response payload @@ -175,6 +173,7 @@ func (o *GetStatsDefault) GetPayload() *models.Fault { } func (o *GetStatsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_parameters.go b/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_parameters.go index 42fc5a0..625221f 100644 --- a/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_parameters.go +++ b/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_parameters.go @@ -2,9 +2,6 @@ package athletes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ UpdateLoggedInAthleteParams contains all the parameters to send to the API endpo Typically these are written to a http.Request. */ type UpdateLoggedInAthleteParams struct { + /* Weight. The weight of the athlete in kilograms. @@ -135,6 +133,7 @@ func (o *UpdateLoggedInAthleteParams) SetWeight(weight float32) { // WriteToRequest writes these params to a swagger request func (o *UpdateLoggedInAthleteParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_responses.go b/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_responses.go index 202a2dc..72f5569 100644 --- a/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_responses.go +++ b/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_responses.go @@ -2,9 +2,6 @@ package athletes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *UpdateLoggedInAthleteOK) GetPayload() *models.DetailedAthlete { } func (o *UpdateLoggedInAthleteOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedAthlete) // response payload @@ -175,6 +173,7 @@ func (o *UpdateLoggedInAthleteDefault) GetPayload() *models.Fault { } func (o *UpdateLoggedInAthleteDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/clubs/clubs_client.go b/internal/gen/strava-api-go/client/clubs/clubs_client.go index a86de48..72776a2 100644 --- a/internal/gen/strava-api-go/client/clubs/clubs_client.go +++ b/internal/gen/strava-api-go/client/clubs/clubs_client.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_parameters.go b/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_parameters.go index 80b4be1..f450add 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_parameters.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetClubActivitiesByIDParams contains all the parameters to send to the API endpo Typically these are written to a http.Request. */ type GetClubActivitiesByIDParams struct { + /* ID. The identifier of the club. @@ -100,7 +98,9 @@ func (o *GetClubActivitiesByIDParams) WithDefaults() *GetClubActivitiesByIDParam // // All values with no default are reset to their zero value. func (o *GetClubActivitiesByIDParams) SetDefaults() { - perPageDefault := int64(30) + var ( + perPageDefault = int64(30) + ) val := GetClubActivitiesByIDParams{ PerPage: &perPageDefault, @@ -180,6 +180,7 @@ func (o *GetClubActivitiesByIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetClubActivitiesByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -200,6 +201,7 @@ func (o *GetClubActivitiesByIDParams) WriteToRequest(r runtime.ClientRequest, re } qPage := swag.FormatInt64(qrPage) if qPage != "" { + if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -216,6 +218,7 @@ func (o *GetClubActivitiesByIDParams) WriteToRequest(r runtime.ClientRequest, re } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_responses.go b/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_responses.go index 5e1910e..9f2f8aa 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_responses.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetClubActivitiesByIDOK) GetPayload() []*models.ClubActivity { } func (o *GetClubActivitiesByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetClubActivitiesByIDDefault) GetPayload() *models.Fault { } func (o *GetClubActivitiesByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_parameters.go b/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_parameters.go index d379767..ab95989 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_parameters.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetClubAdminsByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetClubAdminsByIDParams struct { + /* ID. The identifier of the club. @@ -100,7 +98,9 @@ func (o *GetClubAdminsByIDParams) WithDefaults() *GetClubAdminsByIDParams { // // All values with no default are reset to their zero value. func (o *GetClubAdminsByIDParams) SetDefaults() { - perPageDefault := int64(30) + var ( + perPageDefault = int64(30) + ) val := GetClubAdminsByIDParams{ PerPage: &perPageDefault, @@ -180,6 +180,7 @@ func (o *GetClubAdminsByIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetClubAdminsByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -200,6 +201,7 @@ func (o *GetClubAdminsByIDParams) WriteToRequest(r runtime.ClientRequest, reg st } qPage := swag.FormatInt64(qrPage) if qPage != "" { + if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -216,6 +218,7 @@ func (o *GetClubAdminsByIDParams) WriteToRequest(r runtime.ClientRequest, reg st } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_responses.go b/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_responses.go index b2732cd..e0252cb 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_responses.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetClubAdminsByIDOK) GetPayload() []*models.SummaryAthlete { } func (o *GetClubAdminsByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetClubAdminsByIDDefault) GetPayload() *models.Fault { } func (o *GetClubAdminsByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/clubs/get_club_by_id_parameters.go b/internal/gen/strava-api-go/client/clubs/get_club_by_id_parameters.go index a7f6ecb..cf7015a 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_by_id_parameters.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetClubByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetClubByIDParams struct { + /* ID. The identifier of the club. @@ -135,6 +133,7 @@ func (o *GetClubByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetClubByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_by_id_responses.go b/internal/gen/strava-api-go/client/clubs/get_club_by_id_responses.go index 45dae63..0ea92f0 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_by_id_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_by_id_responses.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetClubByIDOK) GetPayload() *models.DetailedClub { } func (o *GetClubByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedClub) // response payload @@ -175,6 +173,7 @@ func (o *GetClubByIDDefault) GetPayload() *models.Fault { } func (o *GetClubByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_parameters.go b/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_parameters.go index 6be33bb..34de647 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_parameters.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetClubMembersByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetClubMembersByIDParams struct { + /* ID. The identifier of the club. @@ -100,7 +98,9 @@ func (o *GetClubMembersByIDParams) WithDefaults() *GetClubMembersByIDParams { // // All values with no default are reset to their zero value. func (o *GetClubMembersByIDParams) SetDefaults() { - perPageDefault := int64(30) + var ( + perPageDefault = int64(30) + ) val := GetClubMembersByIDParams{ PerPage: &perPageDefault, @@ -180,6 +180,7 @@ func (o *GetClubMembersByIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetClubMembersByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -200,6 +201,7 @@ func (o *GetClubMembersByIDParams) WriteToRequest(r runtime.ClientRequest, reg s } qPage := swag.FormatInt64(qrPage) if qPage != "" { + if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -216,6 +218,7 @@ func (o *GetClubMembersByIDParams) WriteToRequest(r runtime.ClientRequest, reg s } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_responses.go b/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_responses.go index 4824e0e..9ceae7d 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_responses.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetClubMembersByIDOK) GetPayload() []*models.ClubAthlete { } func (o *GetClubMembersByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetClubMembersByIDDefault) GetPayload() *models.Fault { } func (o *GetClubMembersByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_parameters.go b/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_parameters.go index 7dd4862..1f34fdd 100644 --- a/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_parameters.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetLoggedInAthleteClubsParams contains all the parameters to send to the API end Typically these are written to a http.Request. */ type GetLoggedInAthleteClubsParams struct { + /* Page. Page number. Defaults to 1. @@ -92,7 +90,9 @@ func (o *GetLoggedInAthleteClubsParams) WithDefaults() *GetLoggedInAthleteClubsP // // All values with no default are reset to their zero value. func (o *GetLoggedInAthleteClubsParams) SetDefaults() { - perPageDefault := int64(30) + var ( + perPageDefault = int64(30) + ) val := GetLoggedInAthleteClubsParams{ PerPage: &perPageDefault, @@ -161,6 +161,7 @@ func (o *GetLoggedInAthleteClubsParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteClubsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -176,6 +177,7 @@ func (o *GetLoggedInAthleteClubsParams) WriteToRequest(r runtime.ClientRequest, } qPage := swag.FormatInt64(qrPage) if qPage != "" { + if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -192,6 +194,7 @@ func (o *GetLoggedInAthleteClubsParams) WriteToRequest(r runtime.ClientRequest, } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_responses.go b/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_responses.go index a9c3509..90f09cc 100644 --- a/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_responses.go @@ -2,9 +2,6 @@ package clubs -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetLoggedInAthleteClubsOK) GetPayload() []*models.SummaryClub { } func (o *GetLoggedInAthleteClubsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetLoggedInAthleteClubsDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteClubsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/gears/gears_client.go b/internal/gen/strava-api-go/client/gears/gears_client.go index ca1c728..df88278 100644 --- a/internal/gen/strava-api-go/client/gears/gears_client.go +++ b/internal/gen/strava-api-go/client/gears/gears_client.go @@ -2,9 +2,6 @@ package gears -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/client/gears/get_gear_by_id_parameters.go b/internal/gen/strava-api-go/client/gears/get_gear_by_id_parameters.go index 7255ceb..d5d5341 100644 --- a/internal/gen/strava-api-go/client/gears/get_gear_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/gears/get_gear_by_id_parameters.go @@ -2,9 +2,6 @@ package gears -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -60,6 +57,7 @@ GetGearByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetGearByIDParams struct { + /* ID. The identifier of the gear. @@ -132,6 +130,7 @@ func (o *GetGearByIDParams) SetID(id string) { // WriteToRequest writes these params to a swagger request func (o *GetGearByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/gears/get_gear_by_id_responses.go b/internal/gen/strava-api-go/client/gears/get_gear_by_id_responses.go index 4bafeca..d6ff8da 100644 --- a/internal/gen/strava-api-go/client/gears/get_gear_by_id_responses.go +++ b/internal/gen/strava-api-go/client/gears/get_gear_by_id_responses.go @@ -2,9 +2,6 @@ package gears -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetGearByIDOK) GetPayload() *models.DetailedGear { } func (o *GetGearByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedGear) // response payload @@ -175,6 +173,7 @@ func (o *GetGearByIDDefault) GetPayload() *models.Fault { } func (o *GetGearByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_parameters.go b/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_parameters.go index d165943..91a4ad7 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_parameters.go +++ b/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_parameters.go @@ -2,9 +2,6 @@ package routes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetRouteAsGPXParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetRouteAsGPXParams struct { + /* ID. The identifier of the route. @@ -135,6 +133,7 @@ func (o *GetRouteAsGPXParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetRouteAsGPXParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_responses.go b/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_responses.go index 8852eef..4b38e0d 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_responses.go +++ b/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_responses.go @@ -2,9 +2,6 @@ package routes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -53,7 +50,8 @@ GetRouteAsGPXOK describes a response with status code 200, with default header v A GPX file with the route. */ -type GetRouteAsGPXOK struct{} +type GetRouteAsGPXOK struct { +} // IsSuccess returns true when this get route as g p x o k response has a 2xx status code func (o *GetRouteAsGPXOK) IsSuccess() bool { @@ -94,6 +92,7 @@ func (o *GetRouteAsGPXOK) String() string { } func (o *GetRouteAsGPXOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + return nil } @@ -160,6 +159,7 @@ func (o *GetRouteAsGPXDefault) GetPayload() *models.Fault { } func (o *GetRouteAsGPXDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_parameters.go b/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_parameters.go index af1ee55..09f92e5 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_parameters.go +++ b/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_parameters.go @@ -2,9 +2,6 @@ package routes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetRouteAsTCXParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetRouteAsTCXParams struct { + /* ID. The identifier of the route. @@ -135,6 +133,7 @@ func (o *GetRouteAsTCXParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetRouteAsTCXParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_responses.go b/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_responses.go index d9df217..7f5ed31 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_responses.go +++ b/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_responses.go @@ -2,9 +2,6 @@ package routes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -53,7 +50,8 @@ GetRouteAsTCXOK describes a response with status code 200, with default header v A TCX file with the route. */ -type GetRouteAsTCXOK struct{} +type GetRouteAsTCXOK struct { +} // IsSuccess returns true when this get route as t c x o k response has a 2xx status code func (o *GetRouteAsTCXOK) IsSuccess() bool { @@ -94,6 +92,7 @@ func (o *GetRouteAsTCXOK) String() string { } func (o *GetRouteAsTCXOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + return nil } @@ -160,6 +159,7 @@ func (o *GetRouteAsTCXDefault) GetPayload() *models.Fault { } func (o *GetRouteAsTCXDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/routes/get_route_by_id_parameters.go b/internal/gen/strava-api-go/client/routes/get_route_by_id_parameters.go index a7fb3d0..92d1212 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/routes/get_route_by_id_parameters.go @@ -2,9 +2,6 @@ package routes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetRouteByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetRouteByIDParams struct { + /* ID. The identifier of the route. @@ -135,6 +133,7 @@ func (o *GetRouteByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetRouteByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_route_by_id_responses.go b/internal/gen/strava-api-go/client/routes/get_route_by_id_responses.go index cc38884..ea2b707 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_by_id_responses.go +++ b/internal/gen/strava-api-go/client/routes/get_route_by_id_responses.go @@ -2,9 +2,6 @@ package routes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetRouteByIDOK) GetPayload() *models.Route { } func (o *GetRouteByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Route) // response payload @@ -175,6 +173,7 @@ func (o *GetRouteByIDDefault) GetPayload() *models.Fault { } func (o *GetRouteByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_parameters.go b/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_parameters.go index 0b43432..23157ed 100644 --- a/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_parameters.go +++ b/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_parameters.go @@ -2,9 +2,6 @@ package routes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetRoutesByAthleteIDParams contains all the parameters to send to the API endpoi Typically these are written to a http.Request. */ type GetRoutesByAthleteIDParams struct { + /* Page. Page number. Defaults to 1. @@ -92,7 +90,9 @@ func (o *GetRoutesByAthleteIDParams) WithDefaults() *GetRoutesByAthleteIDParams // // All values with no default are reset to their zero value. func (o *GetRoutesByAthleteIDParams) SetDefaults() { - perPageDefault := int64(30) + var ( + perPageDefault = int64(30) + ) val := GetRoutesByAthleteIDParams{ PerPage: &perPageDefault, @@ -161,6 +161,7 @@ func (o *GetRoutesByAthleteIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetRoutesByAthleteIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -176,6 +177,7 @@ func (o *GetRoutesByAthleteIDParams) WriteToRequest(r runtime.ClientRequest, reg } qPage := swag.FormatInt64(qrPage) if qPage != "" { + if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -192,6 +194,7 @@ func (o *GetRoutesByAthleteIDParams) WriteToRequest(r runtime.ClientRequest, reg } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_responses.go b/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_responses.go index 4e4d6c3..aa90474 100644 --- a/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_responses.go +++ b/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_responses.go @@ -2,9 +2,6 @@ package routes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetRoutesByAthleteIDOK) GetPayload() []*models.Route { } func (o *GetRoutesByAthleteIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetRoutesByAthleteIDDefault) GetPayload() *models.Fault { } func (o *GetRoutesByAthleteIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/routes/routes_client.go b/internal/gen/strava-api-go/client/routes/routes_client.go index 28892b5..df9b23e 100644 --- a/internal/gen/strava-api-go/client/routes/routes_client.go +++ b/internal/gen/strava-api-go/client/routes/routes_client.go @@ -2,9 +2,6 @@ package routes -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_parameters.go b/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_parameters.go index fbaae97..11d5586 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_parameters.go +++ b/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_parameters.go @@ -2,9 +2,6 @@ package segment_efforts -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetEffortsBySegmentIDParams contains all the parameters to send to the API endpo Typically these are written to a http.Request. */ type GetEffortsBySegmentIDParams struct { + /* EndDateLocal. ISO 8601 formatted date time. @@ -108,7 +106,9 @@ func (o *GetEffortsBySegmentIDParams) WithDefaults() *GetEffortsBySegmentIDParam // // All values with no default are reset to their zero value. func (o *GetEffortsBySegmentIDParams) SetDefaults() { - perPageDefault := int64(30) + var ( + perPageDefault = int64(30) + ) val := GetEffortsBySegmentIDParams{ PerPage: &perPageDefault, @@ -199,6 +199,7 @@ func (o *GetEffortsBySegmentIDParams) SetStartDateLocal(startDateLocal *strfmt.D // WriteToRequest writes these params to a swagger request func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -214,6 +215,7 @@ func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, re } qEndDateLocal := qrEndDateLocal.String() if qEndDateLocal != "" { + if err := r.SetQueryParam("end_date_local", qEndDateLocal); err != nil { return err } @@ -230,6 +232,7 @@ func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, re } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } @@ -240,6 +243,7 @@ func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, re qrSegmentID := o.SegmentID qSegmentID := swag.FormatInt64(qrSegmentID) if qSegmentID != "" { + if err := r.SetQueryParam("segment_id", qSegmentID); err != nil { return err } @@ -255,6 +259,7 @@ func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, re } qStartDateLocal := qrStartDateLocal.String() if qStartDateLocal != "" { + if err := r.SetQueryParam("start_date_local", qStartDateLocal); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_responses.go b/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_responses.go index 6a28db2..5a9e9ce 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_responses.go +++ b/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_responses.go @@ -2,9 +2,6 @@ package segment_efforts -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetEffortsBySegmentIDOK) GetPayload() []*models.DetailedSegmentEffort { } func (o *GetEffortsBySegmentIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetEffortsBySegmentIDDefault) GetPayload() *models.Fault { } func (o *GetEffortsBySegmentIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_parameters.go b/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_parameters.go index 817a2b6..4ba175f 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_parameters.go @@ -2,9 +2,6 @@ package segment_efforts -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetSegmentEffortByIDParams contains all the parameters to send to the API endpoi Typically these are written to a http.Request. */ type GetSegmentEffortByIDParams struct { + /* ID. The identifier of the segment effort. @@ -135,6 +133,7 @@ func (o *GetSegmentEffortByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetSegmentEffortByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_responses.go b/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_responses.go index 82b1d24..ef40e16 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_responses.go +++ b/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_responses.go @@ -2,9 +2,6 @@ package segment_efforts -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetSegmentEffortByIDOK) GetPayload() *models.DetailedSegmentEffort { } func (o *GetSegmentEffortByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedSegmentEffort) // response payload @@ -175,6 +173,7 @@ func (o *GetSegmentEffortByIDDefault) GetPayload() *models.Fault { } func (o *GetSegmentEffortByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/segment_efforts/segment_efforts_client.go b/internal/gen/strava-api-go/client/segment_efforts/segment_efforts_client.go index 4cef0b5..83dbcaa 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/segment_efforts_client.go +++ b/internal/gen/strava-api-go/client/segment_efforts/segment_efforts_client.go @@ -2,9 +2,6 @@ package segment_efforts -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/client/segments/explore_segments_parameters.go b/internal/gen/strava-api-go/client/segments/explore_segments_parameters.go index 73dd9ba..cdaa362 100644 --- a/internal/gen/strava-api-go/client/segments/explore_segments_parameters.go +++ b/internal/gen/strava-api-go/client/segments/explore_segments_parameters.go @@ -2,9 +2,6 @@ package segments -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ ExploreSegmentsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type ExploreSegmentsParams struct { + /* ActivityType. Desired activity type. @@ -184,6 +182,7 @@ func (o *ExploreSegmentsParams) SetMinCat(minCat *int64) { // WriteToRequest writes these params to a swagger request func (o *ExploreSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -199,6 +198,7 @@ func (o *ExploreSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strf } qActivityType := qrActivityType if qActivityType != "" { + if err := r.SetQueryParam("activity_type", qActivityType); err != nil { return err } @@ -226,6 +226,7 @@ func (o *ExploreSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strf } qMaxCat := swag.FormatInt64(qrMaxCat) if qMaxCat != "" { + if err := r.SetQueryParam("max_cat", qMaxCat); err != nil { return err } @@ -242,6 +243,7 @@ func (o *ExploreSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strf } qMinCat := swag.FormatInt64(qrMinCat) if qMinCat != "" { + if err := r.SetQueryParam("min_cat", qMinCat); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segments/explore_segments_responses.go b/internal/gen/strava-api-go/client/segments/explore_segments_responses.go index db39da4..f11b55a 100644 --- a/internal/gen/strava-api-go/client/segments/explore_segments_responses.go +++ b/internal/gen/strava-api-go/client/segments/explore_segments_responses.go @@ -2,9 +2,6 @@ package segments -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *ExploreSegmentsOK) GetPayload() *models.ExplorerResponse { } func (o *ExploreSegmentsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.ExplorerResponse) // response payload @@ -175,6 +173,7 @@ func (o *ExploreSegmentsDefault) GetPayload() *models.Fault { } func (o *ExploreSegmentsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_parameters.go b/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_parameters.go index b44ca68..62c8aeb 100644 --- a/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_parameters.go +++ b/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_parameters.go @@ -2,9 +2,6 @@ package segments -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetLoggedInAthleteStarredSegmentsParams contains all the parameters to send to t Typically these are written to a http.Request. */ type GetLoggedInAthleteStarredSegmentsParams struct { + /* Page. Page number. Defaults to 1. @@ -92,7 +90,9 @@ func (o *GetLoggedInAthleteStarredSegmentsParams) WithDefaults() *GetLoggedInAth // // All values with no default are reset to their zero value. func (o *GetLoggedInAthleteStarredSegmentsParams) SetDefaults() { - perPageDefault := int64(30) + var ( + perPageDefault = int64(30) + ) val := GetLoggedInAthleteStarredSegmentsParams{ PerPage: &perPageDefault, @@ -161,6 +161,7 @@ func (o *GetLoggedInAthleteStarredSegmentsParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteStarredSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -176,6 +177,7 @@ func (o *GetLoggedInAthleteStarredSegmentsParams) WriteToRequest(r runtime.Clien } qPage := swag.FormatInt64(qrPage) if qPage != "" { + if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -192,6 +194,7 @@ func (o *GetLoggedInAthleteStarredSegmentsParams) WriteToRequest(r runtime.Clien } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { + if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_responses.go b/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_responses.go index ada5e48..4d60175 100644 --- a/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_responses.go +++ b/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_responses.go @@ -2,9 +2,6 @@ package segments -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetLoggedInAthleteStarredSegmentsOK) GetPayload() []*models.SummarySegm } func (o *GetLoggedInAthleteStarredSegmentsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + // response payload if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err @@ -173,6 +171,7 @@ func (o *GetLoggedInAthleteStarredSegmentsDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteStarredSegmentsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/segments/get_segment_by_id_parameters.go b/internal/gen/strava-api-go/client/segments/get_segment_by_id_parameters.go index 6af7a83..583928c 100644 --- a/internal/gen/strava-api-go/client/segments/get_segment_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/segments/get_segment_by_id_parameters.go @@ -2,9 +2,6 @@ package segments -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetSegmentByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetSegmentByIDParams struct { + /* ID. The identifier of the segment. @@ -135,6 +133,7 @@ func (o *GetSegmentByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetSegmentByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segments/get_segment_by_id_responses.go b/internal/gen/strava-api-go/client/segments/get_segment_by_id_responses.go index 0d37f1b..f45f508 100644 --- a/internal/gen/strava-api-go/client/segments/get_segment_by_id_responses.go +++ b/internal/gen/strava-api-go/client/segments/get_segment_by_id_responses.go @@ -2,9 +2,6 @@ package segments -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetSegmentByIDOK) GetPayload() *models.DetailedSegment { } func (o *GetSegmentByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedSegment) // response payload @@ -175,6 +173,7 @@ func (o *GetSegmentByIDDefault) GetPayload() *models.Fault { } func (o *GetSegmentByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/segments/segments_client.go b/internal/gen/strava-api-go/client/segments/segments_client.go index 9b96ff1..ff70a4a 100644 --- a/internal/gen/strava-api-go/client/segments/segments_client.go +++ b/internal/gen/strava-api-go/client/segments/segments_client.go @@ -2,9 +2,6 @@ package segments -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/client/segments/star_segment_parameters.go b/internal/gen/strava-api-go/client/segments/star_segment_parameters.go index 0535c28..26ea4ca 100644 --- a/internal/gen/strava-api-go/client/segments/star_segment_parameters.go +++ b/internal/gen/strava-api-go/client/segments/star_segment_parameters.go @@ -2,9 +2,6 @@ package segments -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ StarSegmentParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type StarSegmentParams struct { + /* ID. The identifier of the segment to star. @@ -92,7 +90,9 @@ func (o *StarSegmentParams) WithDefaults() *StarSegmentParams { // // All values with no default are reset to their zero value. func (o *StarSegmentParams) SetDefaults() { - starredDefault := bool(false) + var ( + starredDefault = bool(false) + ) val := StarSegmentParams{ Starred: starredDefault, @@ -161,6 +161,7 @@ func (o *StarSegmentParams) SetStarred(starred bool) { // WriteToRequest writes these params to a swagger request func (o *StarSegmentParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segments/star_segment_responses.go b/internal/gen/strava-api-go/client/segments/star_segment_responses.go index 4a8397d..60b9b37 100644 --- a/internal/gen/strava-api-go/client/segments/star_segment_responses.go +++ b/internal/gen/strava-api-go/client/segments/star_segment_responses.go @@ -2,9 +2,6 @@ package segments -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *StarSegmentOK) GetPayload() *models.DetailedSegment { } func (o *StarSegmentOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.DetailedSegment) // response payload @@ -175,6 +173,7 @@ func (o *StarSegmentDefault) GetPayload() *models.Fault { } func (o *StarSegmentDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/strava_api_v3_client.go b/internal/gen/strava-api-go/client/strava_api_v3_client.go index 7c38703..9764a08 100644 --- a/internal/gen/strava-api-go/client/strava_api_v3_client.go +++ b/internal/gen/strava-api-go/client/strava_api_v3_client.go @@ -2,9 +2,6 @@ package client -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/client/streams/get_activity_streams_parameters.go b/internal/gen/strava-api-go/client/streams/get_activity_streams_parameters.go index 26c9798..e7504ca 100644 --- a/internal/gen/strava-api-go/client/streams/get_activity_streams_parameters.go +++ b/internal/gen/strava-api-go/client/streams/get_activity_streams_parameters.go @@ -2,9 +2,6 @@ package streams -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetActivityStreamsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetActivityStreamsParams struct { + /* ID. The identifier of the activity. @@ -100,7 +98,9 @@ func (o *GetActivityStreamsParams) WithDefaults() *GetActivityStreamsParams { // // All values with no default are reset to their zero value. func (o *GetActivityStreamsParams) SetDefaults() { - keyByTypeDefault := bool(true) + var ( + keyByTypeDefault = bool(true) + ) val := GetActivityStreamsParams{ KeyByType: keyByTypeDefault, @@ -180,6 +180,7 @@ func (o *GetActivityStreamsParams) SetKeys(keys []string) { // WriteToRequest writes these params to a swagger request func (o *GetActivityStreamsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -194,6 +195,7 @@ func (o *GetActivityStreamsParams) WriteToRequest(r runtime.ClientRequest, reg s qrKeyByType := o.KeyByType qKeyByType := swag.FormatBool(qrKeyByType) if qKeyByType != "" { + if err := r.SetQueryParam("key_by_type", qKeyByType); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_activity_streams_responses.go b/internal/gen/strava-api-go/client/streams/get_activity_streams_responses.go index 539f379..1280945 100644 --- a/internal/gen/strava-api-go/client/streams/get_activity_streams_responses.go +++ b/internal/gen/strava-api-go/client/streams/get_activity_streams_responses.go @@ -2,9 +2,6 @@ package streams -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetActivityStreamsOK) GetPayload() *models.StreamSet { } func (o *GetActivityStreamsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.StreamSet) // response payload @@ -175,6 +173,7 @@ func (o *GetActivityStreamsDefault) GetPayload() *models.Fault { } func (o *GetActivityStreamsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/streams/get_route_streams_parameters.go b/internal/gen/strava-api-go/client/streams/get_route_streams_parameters.go index 6046ae5..2c35e81 100644 --- a/internal/gen/strava-api-go/client/streams/get_route_streams_parameters.go +++ b/internal/gen/strava-api-go/client/streams/get_route_streams_parameters.go @@ -2,9 +2,6 @@ package streams -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetRouteStreamsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetRouteStreamsParams struct { + /* ID. The identifier of the route. @@ -135,6 +133,7 @@ func (o *GetRouteStreamsParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetRouteStreamsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_route_streams_responses.go b/internal/gen/strava-api-go/client/streams/get_route_streams_responses.go index 31502a6..6e5ba70 100644 --- a/internal/gen/strava-api-go/client/streams/get_route_streams_responses.go +++ b/internal/gen/strava-api-go/client/streams/get_route_streams_responses.go @@ -2,9 +2,6 @@ package streams -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetRouteStreamsOK) GetPayload() *models.StreamSet { } func (o *GetRouteStreamsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.StreamSet) // response payload @@ -175,6 +173,7 @@ func (o *GetRouteStreamsDefault) GetPayload() *models.Fault { } func (o *GetRouteStreamsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_parameters.go b/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_parameters.go index 82d50b5..e7f0ed2 100644 --- a/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_parameters.go +++ b/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_parameters.go @@ -2,9 +2,6 @@ package streams -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetSegmentEffortStreamsParams contains all the parameters to send to the API end Typically these are written to a http.Request. */ type GetSegmentEffortStreamsParams struct { + /* ID. The identifier of the segment effort. @@ -100,7 +98,9 @@ func (o *GetSegmentEffortStreamsParams) WithDefaults() *GetSegmentEffortStreamsP // // All values with no default are reset to their zero value. func (o *GetSegmentEffortStreamsParams) SetDefaults() { - keyByTypeDefault := bool(true) + var ( + keyByTypeDefault = bool(true) + ) val := GetSegmentEffortStreamsParams{ KeyByType: keyByTypeDefault, @@ -180,6 +180,7 @@ func (o *GetSegmentEffortStreamsParams) SetKeys(keys []string) { // WriteToRequest writes these params to a swagger request func (o *GetSegmentEffortStreamsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -194,6 +195,7 @@ func (o *GetSegmentEffortStreamsParams) WriteToRequest(r runtime.ClientRequest, qrKeyByType := o.KeyByType qKeyByType := swag.FormatBool(qrKeyByType) if qKeyByType != "" { + if err := r.SetQueryParam("key_by_type", qKeyByType); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_responses.go b/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_responses.go index a42cb67..dd95a1c 100644 --- a/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_responses.go +++ b/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_responses.go @@ -2,9 +2,6 @@ package streams -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetSegmentEffortStreamsOK) GetPayload() *models.StreamSet { } func (o *GetSegmentEffortStreamsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.StreamSet) // response payload @@ -175,6 +173,7 @@ func (o *GetSegmentEffortStreamsDefault) GetPayload() *models.Fault { } func (o *GetSegmentEffortStreamsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/streams/get_segment_streams_parameters.go b/internal/gen/strava-api-go/client/streams/get_segment_streams_parameters.go index 544dea0..351292a 100644 --- a/internal/gen/strava-api-go/client/streams/get_segment_streams_parameters.go +++ b/internal/gen/strava-api-go/client/streams/get_segment_streams_parameters.go @@ -2,9 +2,6 @@ package streams -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetSegmentStreamsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetSegmentStreamsParams struct { + /* ID. The identifier of the segment. @@ -100,7 +98,9 @@ func (o *GetSegmentStreamsParams) WithDefaults() *GetSegmentStreamsParams { // // All values with no default are reset to their zero value. func (o *GetSegmentStreamsParams) SetDefaults() { - keyByTypeDefault := bool(true) + var ( + keyByTypeDefault = bool(true) + ) val := GetSegmentStreamsParams{ KeyByType: keyByTypeDefault, @@ -180,6 +180,7 @@ func (o *GetSegmentStreamsParams) SetKeys(keys []string) { // WriteToRequest writes these params to a swagger request func (o *GetSegmentStreamsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -194,6 +195,7 @@ func (o *GetSegmentStreamsParams) WriteToRequest(r runtime.ClientRequest, reg st qrKeyByType := o.KeyByType qKeyByType := swag.FormatBool(qrKeyByType) if qKeyByType != "" { + if err := r.SetQueryParam("key_by_type", qKeyByType); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_segment_streams_responses.go b/internal/gen/strava-api-go/client/streams/get_segment_streams_responses.go index 4325e7f..990a098 100644 --- a/internal/gen/strava-api-go/client/streams/get_segment_streams_responses.go +++ b/internal/gen/strava-api-go/client/streams/get_segment_streams_responses.go @@ -2,9 +2,6 @@ package streams -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetSegmentStreamsOK) GetPayload() *models.StreamSet { } func (o *GetSegmentStreamsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.StreamSet) // response payload @@ -175,6 +173,7 @@ func (o *GetSegmentStreamsDefault) GetPayload() *models.Fault { } func (o *GetSegmentStreamsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/streams/streams_client.go b/internal/gen/strava-api-go/client/streams/streams_client.go index bc56f1e..8c9effa 100644 --- a/internal/gen/strava-api-go/client/streams/streams_client.go +++ b/internal/gen/strava-api-go/client/streams/streams_client.go @@ -2,9 +2,6 @@ package streams -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/client/uploads/create_upload_parameters.go b/internal/gen/strava-api-go/client/uploads/create_upload_parameters.go index b893a33..462ce39 100644 --- a/internal/gen/strava-api-go/client/uploads/create_upload_parameters.go +++ b/internal/gen/strava-api-go/client/uploads/create_upload_parameters.go @@ -2,9 +2,6 @@ package uploads -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -60,6 +57,7 @@ CreateUploadParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type CreateUploadParams struct { + /* Commute. Whether the resulting activity should be tagged as a commute. @@ -234,6 +232,7 @@ func (o *CreateUploadParams) SetTrainer(trainer *string) { // WriteToRequest writes these params to a swagger request func (o *CreateUploadParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -300,6 +299,7 @@ func (o *CreateUploadParams) WriteToRequest(r runtime.ClientRequest, reg strfmt. } if o.File != nil { + if o.File != nil { // form file param file if err := r.SetFileParam("file", o.File); err != nil { diff --git a/internal/gen/strava-api-go/client/uploads/create_upload_responses.go b/internal/gen/strava-api-go/client/uploads/create_upload_responses.go index e9ee021..7ecbfd7 100644 --- a/internal/gen/strava-api-go/client/uploads/create_upload_responses.go +++ b/internal/gen/strava-api-go/client/uploads/create_upload_responses.go @@ -2,9 +2,6 @@ package uploads -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *CreateUploadCreated) GetPayload() *models.Upload { } func (o *CreateUploadCreated) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Upload) // response payload @@ -175,6 +173,7 @@ func (o *CreateUploadDefault) GetPayload() *models.Fault { } func (o *CreateUploadDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/uploads/get_upload_by_id_parameters.go b/internal/gen/strava-api-go/client/uploads/get_upload_by_id_parameters.go index 579ab82..d52c727 100644 --- a/internal/gen/strava-api-go/client/uploads/get_upload_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/uploads/get_upload_by_id_parameters.go @@ -2,9 +2,6 @@ package uploads -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "net/http" @@ -61,6 +58,7 @@ GetUploadByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetUploadByIDParams struct { + /* UploadID. The identifier of the upload. @@ -135,6 +133,7 @@ func (o *GetUploadByIDParams) SetUploadID(uploadID int64) { // WriteToRequest writes these params to a swagger request func (o *GetUploadByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { + if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/uploads/get_upload_by_id_responses.go b/internal/gen/strava-api-go/client/uploads/get_upload_by_id_responses.go index 12a0a64..691cc95 100644 --- a/internal/gen/strava-api-go/client/uploads/get_upload_by_id_responses.go +++ b/internal/gen/strava-api-go/client/uploads/get_upload_by_id_responses.go @@ -2,9 +2,6 @@ package uploads -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "encoding/json" stderrors "errors" @@ -102,6 +99,7 @@ func (o *GetUploadByIDOK) GetPayload() *models.Upload { } func (o *GetUploadByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Upload) // response payload @@ -175,6 +173,7 @@ func (o *GetUploadByIDDefault) GetPayload() *models.Fault { } func (o *GetUploadByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { + o.Payload = new(models.Fault) // response payload diff --git a/internal/gen/strava-api-go/client/uploads/uploads_client.go b/internal/gen/strava-api-go/client/uploads/uploads_client.go index 190c524..f9feea0 100644 --- a/internal/gen/strava-api-go/client/uploads/uploads_client.go +++ b/internal/gen/strava-api-go/client/uploads/uploads_client.go @@ -2,9 +2,6 @@ package uploads -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" diff --git a/internal/gen/strava-api-go/models/activity_stats.go b/internal/gen/strava-api-go/models/activity_stats.go index 9cf5065..880ebeb 100644 --- a/internal/gen/strava-api-go/models/activity_stats.go +++ b/internal/gen/strava-api-go/models/activity_stats.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -18,6 +15,7 @@ import ( // // swagger:model activityStats type ActivityStats struct { + // all ride totals AllRideTotals *ActivityTotal `json:"all_ride_totals,omitempty"` @@ -352,6 +350,7 @@ func (m *ActivityStats) ContextValidate(ctx context.Context, formats strfmt.Regi } func (m *ActivityStats) contextValidateAllRideTotals(ctx context.Context, formats strfmt.Registry) error { + if m.AllRideTotals != nil { if swag.IsZero(m.AllRideTotals) { // not required @@ -376,6 +375,7 @@ func (m *ActivityStats) contextValidateAllRideTotals(ctx context.Context, format } func (m *ActivityStats) contextValidateAllRunTotals(ctx context.Context, formats strfmt.Registry) error { + if m.AllRunTotals != nil { if swag.IsZero(m.AllRunTotals) { // not required @@ -400,6 +400,7 @@ func (m *ActivityStats) contextValidateAllRunTotals(ctx context.Context, formats } func (m *ActivityStats) contextValidateAllSwimTotals(ctx context.Context, formats strfmt.Registry) error { + if m.AllSwimTotals != nil { if swag.IsZero(m.AllSwimTotals) { // not required @@ -424,6 +425,7 @@ func (m *ActivityStats) contextValidateAllSwimTotals(ctx context.Context, format } func (m *ActivityStats) contextValidateRecentRideTotals(ctx context.Context, formats strfmt.Registry) error { + if m.RecentRideTotals != nil { if swag.IsZero(m.RecentRideTotals) { // not required @@ -448,6 +450,7 @@ func (m *ActivityStats) contextValidateRecentRideTotals(ctx context.Context, for } func (m *ActivityStats) contextValidateRecentRunTotals(ctx context.Context, formats strfmt.Registry) error { + if m.RecentRunTotals != nil { if swag.IsZero(m.RecentRunTotals) { // not required @@ -472,6 +475,7 @@ func (m *ActivityStats) contextValidateRecentRunTotals(ctx context.Context, form } func (m *ActivityStats) contextValidateRecentSwimTotals(ctx context.Context, formats strfmt.Registry) error { + if m.RecentSwimTotals != nil { if swag.IsZero(m.RecentSwimTotals) { // not required @@ -496,6 +500,7 @@ func (m *ActivityStats) contextValidateRecentSwimTotals(ctx context.Context, for } func (m *ActivityStats) contextValidateYtdRideTotals(ctx context.Context, formats strfmt.Registry) error { + if m.YtdRideTotals != nil { if swag.IsZero(m.YtdRideTotals) { // not required @@ -520,6 +525,7 @@ func (m *ActivityStats) contextValidateYtdRideTotals(ctx context.Context, format } func (m *ActivityStats) contextValidateYtdRunTotals(ctx context.Context, formats strfmt.Registry) error { + if m.YtdRunTotals != nil { if swag.IsZero(m.YtdRunTotals) { // not required @@ -544,6 +550,7 @@ func (m *ActivityStats) contextValidateYtdRunTotals(ctx context.Context, formats } func (m *ActivityStats) contextValidateYtdSwimTotals(ctx context.Context, formats strfmt.Registry) error { + if m.YtdSwimTotals != nil { if swag.IsZero(m.YtdSwimTotals) { // not required diff --git a/internal/gen/strava-api-go/models/activity_total.go b/internal/gen/strava-api-go/models/activity_total.go index 1b6980f..fba11aa 100644 --- a/internal/gen/strava-api-go/models/activity_total.go +++ b/internal/gen/strava-api-go/models/activity_total.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model activityTotal type ActivityTotal struct { + // The total number of achievements of the considered activities. AchievementCount int64 `json:"achievement_count,omitempty"` diff --git a/internal/gen/strava-api-go/models/activity_type.go b/internal/gen/strava-api-go/models/activity_type.go index b3e523b..0e7fd24 100644 --- a/internal/gen/strava-api-go/models/activity_type.go +++ b/internal/gen/strava-api-go/models/activity_type.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" diff --git a/internal/gen/strava-api-go/models/activity_zone.go b/internal/gen/strava-api-go/models/activity_zone.go index 7aed2f6..d88ac11 100644 --- a/internal/gen/strava-api-go/models/activity_zone.go +++ b/internal/gen/strava-api-go/models/activity_zone.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -20,6 +17,7 @@ import ( // // swagger:model activityZone type ActivityZone struct { + // custom zones CustomZones bool `json:"custom_zones,omitempty"` @@ -139,6 +137,7 @@ func (m *ActivityZone) ContextValidate(ctx context.Context, formats strfmt.Regis } func (m *ActivityZone) contextValidateDistributionBuckets(ctx context.Context, formats strfmt.Registry) error { + if err := m.DistributionBuckets.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { diff --git a/internal/gen/strava-api-go/models/altitude_stream.go b/internal/gen/strava-api-go/models/altitude_stream.go index 4319c94..2daad46 100644 --- a/internal/gen/strava-api-go/models/altitude_stream.go +++ b/internal/gen/strava-api-go/models/altitude_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/base_stream.go b/internal/gen/strava-api-go/models/base_stream.go index 3974acc..2dacaa9 100644 --- a/internal/gen/strava-api-go/models/base_stream.go +++ b/internal/gen/strava-api-go/models/base_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -19,6 +16,7 @@ import ( // // swagger:model baseStream type BaseStream struct { + // The number of data points in this stream OriginalSize int64 `json:"original_size,omitempty"` diff --git a/internal/gen/strava-api-go/models/cadence_stream.go b/internal/gen/strava-api-go/models/cadence_stream.go index 6c3c83f..437dd6a 100644 --- a/internal/gen/strava-api-go/models/cadence_stream.go +++ b/internal/gen/strava-api-go/models/cadence_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/club_activity.go b/internal/gen/strava-api-go/models/club_activity.go index 02bae7e..f0151b8 100644 --- a/internal/gen/strava-api-go/models/club_activity.go +++ b/internal/gen/strava-api-go/models/club_activity.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -18,6 +15,7 @@ import ( // // swagger:model clubActivity type ClubActivity struct { + // athlete Athlete *MetaAthlete `json:"athlete,omitempty"` @@ -156,6 +154,7 @@ func (m *ClubActivity) ContextValidate(ctx context.Context, formats strfmt.Regis } func (m *ClubActivity) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { + if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -180,6 +179,7 @@ func (m *ClubActivity) contextValidateAthlete(ctx context.Context, formats strfm } func (m *ClubActivity) contextValidateSportType(ctx context.Context, formats strfmt.Registry) error { + if swag.IsZero(m.SportType) { // not required return nil } @@ -201,6 +201,7 @@ func (m *ClubActivity) contextValidateSportType(ctx context.Context, formats str } func (m *ClubActivity) contextValidateType(ctx context.Context, formats strfmt.Registry) error { + if swag.IsZero(m.Type) { // not required return nil } diff --git a/internal/gen/strava-api-go/models/club_athlete.go b/internal/gen/strava-api-go/models/club_athlete.go index 0f9dc38..d225b3a 100644 --- a/internal/gen/strava-api-go/models/club_athlete.go +++ b/internal/gen/strava-api-go/models/club_athlete.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model clubAthlete type ClubAthlete struct { + // Whether the athlete is a club admin. Admin bool `json:"admin,omitempty"` diff --git a/internal/gen/strava-api-go/models/comment.go b/internal/gen/strava-api-go/models/comment.go index 7bcf469..e8bd261 100644 --- a/internal/gen/strava-api-go/models/comment.go +++ b/internal/gen/strava-api-go/models/comment.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -19,6 +16,7 @@ import ( // // swagger:model comment type Comment struct { + // The identifier of the activity this comment is related to ActivityID int64 `json:"activity_id,omitempty"` @@ -104,6 +102,7 @@ func (m *Comment) ContextValidate(ctx context.Context, formats strfmt.Registry) } func (m *Comment) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { + if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required diff --git a/internal/gen/strava-api-go/models/comment_athlete.go b/internal/gen/strava-api-go/models/comment_athlete.go index 6d0eeee..f9134ad 100644 --- a/internal/gen/strava-api-go/models/comment_athlete.go +++ b/internal/gen/strava-api-go/models/comment_athlete.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -233,6 +230,7 @@ func (m *CommentAthlete) Validate(formats strfmt.Registry) error { } func (m *CommentAthlete) validateCreatedAt(formats strfmt.Registry) error { + if swag.IsZero(m.CreatedAt) { // not required return nil } @@ -265,6 +263,7 @@ func (m *CommentAthlete) validateSexEnum(path, location string, value string) er } func (m *CommentAthlete) validateSex(formats strfmt.Registry) error { + if swag.IsZero(m.Sex) { // not required return nil } @@ -278,6 +277,7 @@ func (m *CommentAthlete) validateSex(formats strfmt.Registry) error { } func (m *CommentAthlete) validateUpdatedAt(formats strfmt.Registry) error { + if swag.IsZero(m.UpdatedAt) { // not required return nil } diff --git a/internal/gen/strava-api-go/models/detailed_activity.go b/internal/gen/strava-api-go/models/detailed_activity.go index f2bb6de..43c6e68 100644 --- a/internal/gen/strava-api-go/models/detailed_activity.go +++ b/internal/gen/strava-api-go/models/detailed_activity.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -225,6 +222,7 @@ func (m *DetailedActivity) Validate(formats strfmt.Registry) error { } func (m *DetailedActivity) validateBestEfforts(formats strfmt.Registry) error { + if swag.IsZero(m.BestEfforts) { // not required return nil } @@ -255,6 +253,7 @@ func (m *DetailedActivity) validateBestEfforts(formats strfmt.Registry) error { } func (m *DetailedActivity) validateGear(formats strfmt.Registry) error { + if swag.IsZero(m.Gear) { // not required return nil } @@ -278,6 +277,7 @@ func (m *DetailedActivity) validateGear(formats strfmt.Registry) error { } func (m *DetailedActivity) validateLaps(formats strfmt.Registry) error { + if swag.IsZero(m.Laps) { // not required return nil } @@ -308,6 +308,7 @@ func (m *DetailedActivity) validateLaps(formats strfmt.Registry) error { } func (m *DetailedActivity) validatePhotos(formats strfmt.Registry) error { + if swag.IsZero(m.Photos) { // not required return nil } @@ -331,6 +332,7 @@ func (m *DetailedActivity) validatePhotos(formats strfmt.Registry) error { } func (m *DetailedActivity) validateSegmentEfforts(formats strfmt.Registry) error { + if swag.IsZero(m.SegmentEfforts) { // not required return nil } @@ -361,6 +363,7 @@ func (m *DetailedActivity) validateSegmentEfforts(formats strfmt.Registry) error } func (m *DetailedActivity) validateSplitsMetric(formats strfmt.Registry) error { + if swag.IsZero(m.SplitsMetric) { // not required return nil } @@ -391,6 +394,7 @@ func (m *DetailedActivity) validateSplitsMetric(formats strfmt.Registry) error { } func (m *DetailedActivity) validateSplitsStandard(formats strfmt.Registry) error { + if swag.IsZero(m.SplitsStandard) { // not required return nil } @@ -464,7 +468,9 @@ func (m *DetailedActivity) ContextValidate(ctx context.Context, formats strfmt.R } func (m *DetailedActivity) contextValidateBestEfforts(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.BestEfforts); i++ { + if m.BestEfforts[i] != nil { if swag.IsZero(m.BestEfforts[i]) { // not required @@ -484,12 +490,14 @@ func (m *DetailedActivity) contextValidateBestEfforts(ctx context.Context, forma return err } } + } return nil } func (m *DetailedActivity) contextValidateGear(ctx context.Context, formats strfmt.Registry) error { + if m.Gear != nil { if swag.IsZero(m.Gear) { // not required @@ -514,7 +522,9 @@ func (m *DetailedActivity) contextValidateGear(ctx context.Context, formats strf } func (m *DetailedActivity) contextValidateLaps(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.Laps); i++ { + if m.Laps[i] != nil { if swag.IsZero(m.Laps[i]) { // not required @@ -534,12 +544,14 @@ func (m *DetailedActivity) contextValidateLaps(ctx context.Context, formats strf return err } } + } return nil } func (m *DetailedActivity) contextValidatePhotos(ctx context.Context, formats strfmt.Registry) error { + if m.Photos != nil { if swag.IsZero(m.Photos) { // not required @@ -564,7 +576,9 @@ func (m *DetailedActivity) contextValidatePhotos(ctx context.Context, formats st } func (m *DetailedActivity) contextValidateSegmentEfforts(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.SegmentEfforts); i++ { + if m.SegmentEfforts[i] != nil { if swag.IsZero(m.SegmentEfforts[i]) { // not required @@ -584,13 +598,16 @@ func (m *DetailedActivity) contextValidateSegmentEfforts(ctx context.Context, fo return err } } + } return nil } func (m *DetailedActivity) contextValidateSplitsMetric(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.SplitsMetric); i++ { + if m.SplitsMetric[i] != nil { if swag.IsZero(m.SplitsMetric[i]) { // not required @@ -610,13 +627,16 @@ func (m *DetailedActivity) contextValidateSplitsMetric(ctx context.Context, form return err } } + } return nil } func (m *DetailedActivity) contextValidateSplitsStandard(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.SplitsStandard); i++ { + if m.SplitsStandard[i] != nil { if swag.IsZero(m.SplitsStandard[i]) { // not required @@ -636,6 +656,7 @@ func (m *DetailedActivity) contextValidateSplitsStandard(ctx context.Context, fo return err } } + } return nil @@ -1220,6 +1241,7 @@ func (m *DetailedActivityAllOf0) Validate(formats strfmt.Registry) error { } func (m *DetailedActivityAllOf0) validateAthlete(formats strfmt.Registry) error { + if swag.IsZero(m.Athlete) { // not required return nil } @@ -1243,6 +1265,7 @@ func (m *DetailedActivityAllOf0) validateAthlete(formats strfmt.Registry) error } func (m *DetailedActivityAllOf0) validateAthleteCount(formats strfmt.Registry) error { + if swag.IsZero(m.AthleteCount) { // not required return nil } @@ -1255,6 +1278,7 @@ func (m *DetailedActivityAllOf0) validateAthleteCount(formats strfmt.Registry) e } func (m *DetailedActivityAllOf0) validateEndLatlng(formats strfmt.Registry) error { + if swag.IsZero(m.EndLatlng) { // not required return nil } @@ -1276,6 +1300,7 @@ func (m *DetailedActivityAllOf0) validateEndLatlng(formats strfmt.Registry) erro } func (m *DetailedActivityAllOf0) validateMap(formats strfmt.Registry) error { + if swag.IsZero(m.Map) { // not required return nil } @@ -1299,6 +1324,7 @@ func (m *DetailedActivityAllOf0) validateMap(formats strfmt.Registry) error { } func (m *DetailedActivityAllOf0) validateSportType(formats strfmt.Registry) error { + if swag.IsZero(m.SportType) { // not required return nil } @@ -1320,6 +1346,7 @@ func (m *DetailedActivityAllOf0) validateSportType(formats strfmt.Registry) erro } func (m *DetailedActivityAllOf0) validateStartDate(formats strfmt.Registry) error { + if swag.IsZero(m.StartDate) { // not required return nil } @@ -1332,6 +1359,7 @@ func (m *DetailedActivityAllOf0) validateStartDate(formats strfmt.Registry) erro } func (m *DetailedActivityAllOf0) validateStartDateLocal(formats strfmt.Registry) error { + if swag.IsZero(m.StartDateLocal) { // not required return nil } @@ -1344,6 +1372,7 @@ func (m *DetailedActivityAllOf0) validateStartDateLocal(formats strfmt.Registry) } func (m *DetailedActivityAllOf0) validateStartLatlng(formats strfmt.Registry) error { + if swag.IsZero(m.StartLatlng) { // not required return nil } @@ -1365,6 +1394,7 @@ func (m *DetailedActivityAllOf0) validateStartLatlng(formats strfmt.Registry) er } func (m *DetailedActivityAllOf0) validateType(formats strfmt.Registry) error { + if swag.IsZero(m.Type) { // not required return nil } @@ -1425,6 +1455,7 @@ func (m *DetailedActivityAllOf0) ContextValidate(ctx context.Context, formats st } func (m *DetailedActivityAllOf0) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { + if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -1449,6 +1480,7 @@ func (m *DetailedActivityAllOf0) contextValidateAthlete(ctx context.Context, for } func (m *DetailedActivityAllOf0) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -1466,6 +1498,7 @@ func (m *DetailedActivityAllOf0) contextValidateEndLatlng(ctx context.Context, f } func (m *DetailedActivityAllOf0) contextValidateMap(ctx context.Context, formats strfmt.Registry) error { + if m.Map != nil { if swag.IsZero(m.Map) { // not required @@ -1490,6 +1523,7 @@ func (m *DetailedActivityAllOf0) contextValidateMap(ctx context.Context, formats } func (m *DetailedActivityAllOf0) contextValidateSportType(ctx context.Context, formats strfmt.Registry) error { + if swag.IsZero(m.SportType) { // not required return nil } @@ -1511,6 +1545,7 @@ func (m *DetailedActivityAllOf0) contextValidateSportType(ctx context.Context, f } func (m *DetailedActivityAllOf0) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -1528,6 +1563,7 @@ func (m *DetailedActivityAllOf0) contextValidateStartLatlng(ctx context.Context, } func (m *DetailedActivityAllOf0) contextValidateType(ctx context.Context, formats strfmt.Registry) error { + if swag.IsZero(m.Type) { // not required return nil } @@ -1570,6 +1606,7 @@ func (m *DetailedActivityAllOf0) UnmarshalBinary(b []byte) error { // // swagger:model DetailedActivityLapsItems0 type DetailedActivityLapsItems0 struct { + // activity Activity *MetaActivity `json:"activity,omitempty"` @@ -1742,6 +1779,7 @@ func (m *DetailedActivityLapsItems0) ContextValidate(ctx context.Context, format } func (m *DetailedActivityLapsItems0) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error { + if m.Activity != nil { if swag.IsZero(m.Activity) { // not required @@ -1766,6 +1804,7 @@ func (m *DetailedActivityLapsItems0) contextValidateActivity(ctx context.Context } func (m *DetailedActivityLapsItems0) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { + if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required diff --git a/internal/gen/strava-api-go/models/detailed_activity_all_of1_best_efforts_items.go b/internal/gen/strava-api-go/models/detailed_activity_all_of1_best_efforts_items.go index 7013832..44e3f25 100644 --- a/internal/gen/strava-api-go/models/detailed_activity_all_of1_best_efforts_items.go +++ b/internal/gen/strava-api-go/models/detailed_activity_all_of1_best_efforts_items.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -264,6 +261,7 @@ func (m *DetailedActivityAllOf1BestEffortsItems) Validate(formats strfmt.Registr } func (m *DetailedActivityAllOf1BestEffortsItems) validateActivity(formats strfmt.Registry) error { + if swag.IsZero(m.Activity) { // not required return nil } @@ -287,6 +285,7 @@ func (m *DetailedActivityAllOf1BestEffortsItems) validateActivity(formats strfmt } func (m *DetailedActivityAllOf1BestEffortsItems) validateAthlete(formats strfmt.Registry) error { + if swag.IsZero(m.Athlete) { // not required return nil } @@ -310,6 +309,7 @@ func (m *DetailedActivityAllOf1BestEffortsItems) validateAthlete(formats strfmt. } func (m *DetailedActivityAllOf1BestEffortsItems) validateKomRank(formats strfmt.Registry) error { + if swag.IsZero(m.KomRank) { // not required return nil } @@ -326,6 +326,7 @@ func (m *DetailedActivityAllOf1BestEffortsItems) validateKomRank(formats strfmt. } func (m *DetailedActivityAllOf1BestEffortsItems) validatePrRank(formats strfmt.Registry) error { + if swag.IsZero(m.PrRank) { // not required return nil } @@ -342,6 +343,7 @@ func (m *DetailedActivityAllOf1BestEffortsItems) validatePrRank(formats strfmt.R } func (m *DetailedActivityAllOf1BestEffortsItems) validateSegment(formats strfmt.Registry) error { + if swag.IsZero(m.Segment) { // not required return nil } @@ -392,6 +394,7 @@ func (m *DetailedActivityAllOf1BestEffortsItems) ContextValidate(ctx context.Con } func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error { + if m.Activity != nil { if swag.IsZero(m.Activity) { // not required @@ -416,6 +419,7 @@ func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateActivity(ctx con } func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { + if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -440,6 +444,7 @@ func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateAthlete(ctx cont } func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateSegment(ctx context.Context, formats strfmt.Registry) error { + if m.Segment != nil { if swag.IsZero(m.Segment) { // not required diff --git a/internal/gen/strava-api-go/models/detailed_athlete.go b/internal/gen/strava-api-go/models/detailed_athlete.go index f9f870a..b275d83 100644 --- a/internal/gen/strava-api-go/models/detailed_athlete.go +++ b/internal/gen/strava-api-go/models/detailed_athlete.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -182,6 +179,7 @@ func (m *DetailedAthlete) Validate(formats strfmt.Registry) error { } func (m *DetailedAthlete) validateBikes(formats strfmt.Registry) error { + if swag.IsZero(m.Bikes) { // not required return nil } @@ -212,6 +210,7 @@ func (m *DetailedAthlete) validateBikes(formats strfmt.Registry) error { } func (m *DetailedAthlete) validateClubs(formats strfmt.Registry) error { + if swag.IsZero(m.Clubs) { // not required return nil } @@ -262,6 +261,7 @@ func (m *DetailedAthlete) validateMeasurementPreferenceEnum(path, location strin } func (m *DetailedAthlete) validateMeasurementPreference(formats strfmt.Registry) error { + if swag.IsZero(m.MeasurementPreference) { // not required return nil } @@ -275,6 +275,7 @@ func (m *DetailedAthlete) validateMeasurementPreference(formats strfmt.Registry) } func (m *DetailedAthlete) validateShoes(formats strfmt.Registry) error { + if swag.IsZero(m.Shoes) { // not required return nil } @@ -332,7 +333,9 @@ func (m *DetailedAthlete) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *DetailedAthlete) contextValidateBikes(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.Bikes); i++ { + if m.Bikes[i] != nil { if swag.IsZero(m.Bikes[i]) { // not required @@ -352,13 +355,16 @@ func (m *DetailedAthlete) contextValidateBikes(ctx context.Context, formats strf return err } } + } return nil } func (m *DetailedAthlete) contextValidateClubs(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.Clubs); i++ { + if m.Clubs[i] != nil { if swag.IsZero(m.Clubs[i]) { // not required @@ -378,13 +384,16 @@ func (m *DetailedAthlete) contextValidateClubs(ctx context.Context, formats strf return err } } + } return nil } func (m *DetailedAthlete) contextValidateShoes(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.Shoes); i++ { + if m.Shoes[i] != nil { if swag.IsZero(m.Shoes[i]) { // not required @@ -404,6 +413,7 @@ func (m *DetailedAthlete) contextValidateShoes(ctx context.Context, formats strf return err } } + } return nil diff --git a/internal/gen/strava-api-go/models/detailed_club.go b/internal/gen/strava-api-go/models/detailed_club.go index 24b6829..e991679 100644 --- a/internal/gen/strava-api-go/models/detailed_club.go +++ b/internal/gen/strava-api-go/models/detailed_club.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -144,6 +141,7 @@ func (m *DetailedClub) validateMembershipEnum(path, location string, value strin } func (m *DetailedClub) validateMembership(formats strfmt.Registry) error { + if swag.IsZero(m.Membership) { // not required return nil } diff --git a/internal/gen/strava-api-go/models/detailed_club_all_of0.go b/internal/gen/strava-api-go/models/detailed_club_all_of0.go index f113217..61b988a 100644 --- a/internal/gen/strava-api-go/models/detailed_club_all_of0.go +++ b/internal/gen/strava-api-go/models/detailed_club_all_of0.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -229,11 +226,13 @@ func (m *DetailedClubAllOf0) Validate(formats strfmt.Registry) error { } func (m *DetailedClubAllOf0) validateActivityTypes(formats strfmt.Registry) error { + if swag.IsZero(m.ActivityTypes) { // not required return nil } for i := 0; i < len(m.ActivityTypes); i++ { + if err := m.ActivityTypes[i].Validate(formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -246,6 +245,7 @@ func (m *DetailedClubAllOf0) validateActivityTypes(formats strfmt.Registry) erro return err } + } return nil @@ -272,6 +272,7 @@ func (m *DetailedClubAllOf0) validateSportTypeEnum(path, location string, value } func (m *DetailedClubAllOf0) validateSportType(formats strfmt.Registry) error { + if swag.IsZero(m.SportType) { // not required return nil } @@ -304,6 +305,7 @@ func (m *DetailedClubAllOf0) ContextValidate(ctx context.Context, formats strfmt } func (m *DetailedClubAllOf0) contextValidateActivityTypes(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.ActivityTypes); i++ { if swag.IsZero(m.ActivityTypes[i]) { // not required diff --git a/internal/gen/strava-api-go/models/detailed_gear.go b/internal/gen/strava-api-go/models/detailed_gear.go index aa25e02..2990ae1 100644 --- a/internal/gen/strava-api-go/models/detailed_gear.go +++ b/internal/gen/strava-api-go/models/detailed_gear.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/detailed_segment.go b/internal/gen/strava-api-go/models/detailed_segment.go index 2f1d81d..06588d9 100644 --- a/internal/gen/strava-api-go/models/detailed_segment.go +++ b/internal/gen/strava-api-go/models/detailed_segment.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -177,6 +174,7 @@ func (m *DetailedSegment) Validate(formats strfmt.Registry) error { } func (m *DetailedSegment) validateCreatedAt(formats strfmt.Registry) error { + if swag.IsZero(m.CreatedAt) { // not required return nil } @@ -189,6 +187,7 @@ func (m *DetailedSegment) validateCreatedAt(formats strfmt.Registry) error { } func (m *DetailedSegment) validateMap(formats strfmt.Registry) error { + if swag.IsZero(m.Map) { // not required return nil } @@ -212,6 +211,7 @@ func (m *DetailedSegment) validateMap(formats strfmt.Registry) error { } func (m *DetailedSegment) validateUpdatedAt(formats strfmt.Registry) error { + if swag.IsZero(m.UpdatedAt) { // not required return nil } @@ -243,6 +243,7 @@ func (m *DetailedSegment) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *DetailedSegment) contextValidateMap(ctx context.Context, formats strfmt.Registry) error { + if m.Map != nil { if swag.IsZero(m.Map) { // not required diff --git a/internal/gen/strava-api-go/models/detailed_segment_all_of0.go b/internal/gen/strava-api-go/models/detailed_segment_all_of0.go index 6b822ef..c35eabe 100644 --- a/internal/gen/strava-api-go/models/detailed_segment_all_of0.go +++ b/internal/gen/strava-api-go/models/detailed_segment_all_of0.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -20,6 +17,7 @@ import ( // // swagger:model detailedSegmentAllOf0 type DetailedSegmentAllOf0 struct { + // activity type // Enum: ["Ride","Run"] ActivityType string `json:"activity_type,omitempty"` @@ -260,6 +258,7 @@ func (m *DetailedSegmentAllOf0) ContextValidate(ctx context.Context, formats str } func (m *DetailedSegmentAllOf0) contextValidateAthletePrEffort(ctx context.Context, formats strfmt.Registry) error { + if m.AthletePrEffort != nil { if swag.IsZero(m.AthletePrEffort) { // not required @@ -284,6 +283,7 @@ func (m *DetailedSegmentAllOf0) contextValidateAthletePrEffort(ctx context.Conte } func (m *DetailedSegmentAllOf0) contextValidateAthleteSegmentStats(ctx context.Context, formats strfmt.Registry) error { + if m.AthleteSegmentStats != nil { if swag.IsZero(m.AthleteSegmentStats) { // not required @@ -308,6 +308,7 @@ func (m *DetailedSegmentAllOf0) contextValidateAthleteSegmentStats(ctx context.C } func (m *DetailedSegmentAllOf0) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -325,6 +326,7 @@ func (m *DetailedSegmentAllOf0) contextValidateEndLatlng(ctx context.Context, fo } func (m *DetailedSegmentAllOf0) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { diff --git a/internal/gen/strava-api-go/models/detailed_segment_effort.go b/internal/gen/strava-api-go/models/detailed_segment_effort.go index 9829d62..820d78f 100644 --- a/internal/gen/strava-api-go/models/detailed_segment_effort.go +++ b/internal/gen/strava-api-go/models/detailed_segment_effort.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -264,6 +261,7 @@ func (m *DetailedSegmentEffort) Validate(formats strfmt.Registry) error { } func (m *DetailedSegmentEffort) validateActivity(formats strfmt.Registry) error { + if swag.IsZero(m.Activity) { // not required return nil } @@ -287,6 +285,7 @@ func (m *DetailedSegmentEffort) validateActivity(formats strfmt.Registry) error } func (m *DetailedSegmentEffort) validateAthlete(formats strfmt.Registry) error { + if swag.IsZero(m.Athlete) { // not required return nil } @@ -310,6 +309,7 @@ func (m *DetailedSegmentEffort) validateAthlete(formats strfmt.Registry) error { } func (m *DetailedSegmentEffort) validateKomRank(formats strfmt.Registry) error { + if swag.IsZero(m.KomRank) { // not required return nil } @@ -326,6 +326,7 @@ func (m *DetailedSegmentEffort) validateKomRank(formats strfmt.Registry) error { } func (m *DetailedSegmentEffort) validatePrRank(formats strfmt.Registry) error { + if swag.IsZero(m.PrRank) { // not required return nil } @@ -342,6 +343,7 @@ func (m *DetailedSegmentEffort) validatePrRank(formats strfmt.Registry) error { } func (m *DetailedSegmentEffort) validateSegment(formats strfmt.Registry) error { + if swag.IsZero(m.Segment) { // not required return nil } @@ -392,6 +394,7 @@ func (m *DetailedSegmentEffort) ContextValidate(ctx context.Context, formats str } func (m *DetailedSegmentEffort) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error { + if m.Activity != nil { if swag.IsZero(m.Activity) { // not required @@ -416,6 +419,7 @@ func (m *DetailedSegmentEffort) contextValidateActivity(ctx context.Context, for } func (m *DetailedSegmentEffort) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { + if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -440,6 +444,7 @@ func (m *DetailedSegmentEffort) contextValidateAthlete(ctx context.Context, form } func (m *DetailedSegmentEffort) contextValidateSegment(ctx context.Context, formats strfmt.Registry) error { + if m.Segment != nil { if swag.IsZero(m.Segment) { // not required diff --git a/internal/gen/strava-api-go/models/distance_stream.go b/internal/gen/strava-api-go/models/distance_stream.go index cf512ff..aaf4034 100644 --- a/internal/gen/strava-api-go/models/distance_stream.go +++ b/internal/gen/strava-api-go/models/distance_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/error.go b/internal/gen/strava-api-go/models/error.go index dc1683e..37693e6 100644 --- a/internal/gen/strava-api-go/models/error.go +++ b/internal/gen/strava-api-go/models/error.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model error type Error struct { + // The code associated with this error. Code string `json:"code,omitempty"` diff --git a/internal/gen/strava-api-go/models/explorer_response.go b/internal/gen/strava-api-go/models/explorer_response.go index 08c7da1..1bf5e6b 100644 --- a/internal/gen/strava-api-go/models/explorer_response.go +++ b/internal/gen/strava-api-go/models/explorer_response.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -19,6 +16,7 @@ import ( // // swagger:model explorerResponse type ExplorerResponse struct { + // The set of segments matching an explorer request Segments []*ExplorerSegment `json:"segments"` } @@ -82,7 +80,9 @@ func (m *ExplorerResponse) ContextValidate(ctx context.Context, formats strfmt.R } func (m *ExplorerResponse) contextValidateSegments(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.Segments); i++ { + if m.Segments[i] != nil { if swag.IsZero(m.Segments[i]) { // not required @@ -102,6 +102,7 @@ func (m *ExplorerResponse) contextValidateSegments(ctx context.Context, formats return err } } + } return nil diff --git a/internal/gen/strava-api-go/models/explorer_segment.go b/internal/gen/strava-api-go/models/explorer_segment.go index 17aced3..7053a74 100644 --- a/internal/gen/strava-api-go/models/explorer_segment.go +++ b/internal/gen/strava-api-go/models/explorer_segment.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -20,6 +17,7 @@ import ( // // swagger:model explorerSegment type ExplorerSegment struct { + // The segment's average grade, in percents AvgGrade float32 `json:"avg_grade,omitempty"` @@ -211,6 +209,7 @@ func (m *ExplorerSegment) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *ExplorerSegment) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -228,6 +227,7 @@ func (m *ExplorerSegment) contextValidateEndLatlng(ctx context.Context, formats } func (m *ExplorerSegment) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { diff --git a/internal/gen/strava-api-go/models/fault.go b/internal/gen/strava-api-go/models/fault.go index 994233a..f9ff87e 100644 --- a/internal/gen/strava-api-go/models/fault.go +++ b/internal/gen/strava-api-go/models/fault.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -19,6 +16,7 @@ import ( // // swagger:model fault type Fault struct { + // The set of specific errors associated with this fault, if any. Errors []*Error `json:"errors"` @@ -85,7 +83,9 @@ func (m *Fault) ContextValidate(ctx context.Context, formats strfmt.Registry) er } func (m *Fault) contextValidateErrors(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.Errors); i++ { + if m.Errors[i] != nil { if swag.IsZero(m.Errors[i]) { // not required @@ -105,6 +105,7 @@ func (m *Fault) contextValidateErrors(ctx context.Context, formats strfmt.Regist return err } } + } return nil diff --git a/internal/gen/strava-api-go/models/heart_rate_details.go b/internal/gen/strava-api-go/models/heart_rate_details.go index 25904e5..a37ad64 100644 --- a/internal/gen/strava-api-go/models/heart_rate_details.go +++ b/internal/gen/strava-api-go/models/heart_rate_details.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model heartRateDetails type HeartRateDetails struct { + // The heart heart rate of the athlete during this effort AverageHeartrate float32 `json:"average_heartrate,omitempty"` diff --git a/internal/gen/strava-api-go/models/heart_rate_zone_ranges.go b/internal/gen/strava-api-go/models/heart_rate_zone_ranges.go index 8a7f7a0..3b0a9ef 100644 --- a/internal/gen/strava-api-go/models/heart_rate_zone_ranges.go +++ b/internal/gen/strava-api-go/models/heart_rate_zone_ranges.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -18,6 +15,7 @@ import ( // // swagger:model heartRateZoneRanges type HeartRateZoneRanges struct { + // Whether the athlete has set their own custom heart rate zones CustomZones bool `json:"custom_zones,omitempty"` @@ -75,6 +73,7 @@ func (m *HeartRateZoneRanges) ContextValidate(ctx context.Context, formats strfm } func (m *HeartRateZoneRanges) contextValidateZones(ctx context.Context, formats strfmt.Registry) error { + if err := m.Zones.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { diff --git a/internal/gen/strava-api-go/models/heartrate_stream.go b/internal/gen/strava-api-go/models/heartrate_stream.go index 318b5a8..58e05ee 100644 --- a/internal/gen/strava-api-go/models/heartrate_stream.go +++ b/internal/gen/strava-api-go/models/heartrate_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/lap.go b/internal/gen/strava-api-go/models/lap.go index e2e4ae7..509ef93 100644 --- a/internal/gen/strava-api-go/models/lap.go +++ b/internal/gen/strava-api-go/models/lap.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -19,6 +16,7 @@ import ( // // swagger:model lap type Lap struct { + // activity Activity *MetaActivity `json:"activity,omitempty"` @@ -191,6 +189,7 @@ func (m *Lap) ContextValidate(ctx context.Context, formats strfmt.Registry) erro } func (m *Lap) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error { + if m.Activity != nil { if swag.IsZero(m.Activity) { // not required @@ -215,6 +214,7 @@ func (m *Lap) contextValidateActivity(ctx context.Context, formats strfmt.Regist } func (m *Lap) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { + if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required diff --git a/internal/gen/strava-api-go/models/lat_lng.go b/internal/gen/strava-api-go/models/lat_lng.go index 9a5a6ef..95f5ea6 100644 --- a/internal/gen/strava-api-go/models/lat_lng.go +++ b/internal/gen/strava-api-go/models/lat_lng.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/lat_lng_stream.go b/internal/gen/strava-api-go/models/lat_lng_stream.go index ee55550..7ab2bff 100644 --- a/internal/gen/strava-api-go/models/lat_lng_stream.go +++ b/internal/gen/strava-api-go/models/lat_lng_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -90,11 +87,13 @@ func (m *LatLngStream) Validate(formats strfmt.Registry) error { } func (m *LatLngStream) validateData(formats strfmt.Registry) error { + if swag.IsZero(m.Data) { // not required return nil } for i := 0; i < len(m.Data); i++ { + if err := m.Data[i].Validate(formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -107,6 +106,7 @@ func (m *LatLngStream) validateData(formats strfmt.Registry) error { return err } + } return nil @@ -132,7 +132,9 @@ func (m *LatLngStream) ContextValidate(ctx context.Context, formats strfmt.Regis } func (m *LatLngStream) contextValidateData(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.Data); i++ { + if err := m.Data[i].ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -145,6 +147,7 @@ func (m *LatLngStream) contextValidateData(ctx context.Context, formats strfmt.R return err } + } return nil diff --git a/internal/gen/strava-api-go/models/meta_activity.go b/internal/gen/strava-api-go/models/meta_activity.go index 78e8eb7..c550359 100644 --- a/internal/gen/strava-api-go/models/meta_activity.go +++ b/internal/gen/strava-api-go/models/meta_activity.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model metaActivity type MetaActivity struct { + // The unique identifier of the activity ID int64 `json:"id,omitempty"` } diff --git a/internal/gen/strava-api-go/models/meta_athlete.go b/internal/gen/strava-api-go/models/meta_athlete.go index e45b97f..6cf30d3 100644 --- a/internal/gen/strava-api-go/models/meta_athlete.go +++ b/internal/gen/strava-api-go/models/meta_athlete.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model metaAthlete type MetaAthlete struct { + // The unique identifier of the athlete ID int64 `json:"id,omitempty"` } diff --git a/internal/gen/strava-api-go/models/meta_club.go b/internal/gen/strava-api-go/models/meta_club.go index 3aba95c..cd695f1 100644 --- a/internal/gen/strava-api-go/models/meta_club.go +++ b/internal/gen/strava-api-go/models/meta_club.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model metaClub type MetaClub struct { + // The club's unique identifier. ID int64 `json:"id,omitempty"` diff --git a/internal/gen/strava-api-go/models/moving_stream.go b/internal/gen/strava-api-go/models/moving_stream.go index dc0dbd2..5ea83ec 100644 --- a/internal/gen/strava-api-go/models/moving_stream.go +++ b/internal/gen/strava-api-go/models/moving_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/photos_summary.go b/internal/gen/strava-api-go/models/photos_summary.go index 4091966..0ddf4bd 100644 --- a/internal/gen/strava-api-go/models/photos_summary.go +++ b/internal/gen/strava-api-go/models/photos_summary.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -18,6 +15,7 @@ import ( // // swagger:model photosSummary type PhotosSummary struct { + // The number of photos Count int64 `json:"count,omitempty"` @@ -77,6 +75,7 @@ func (m *PhotosSummary) ContextValidate(ctx context.Context, formats strfmt.Regi } func (m *PhotosSummary) contextValidatePrimary(ctx context.Context, formats strfmt.Registry) error { + if m.Primary != nil { if swag.IsZero(m.Primary) { // not required @@ -122,6 +121,7 @@ func (m *PhotosSummary) UnmarshalBinary(b []byte) error { // // swagger:model PhotosSummaryPrimary type PhotosSummaryPrimary struct { + // id ID int64 `json:"id,omitempty"` diff --git a/internal/gen/strava-api-go/models/polyline_map.go b/internal/gen/strava-api-go/models/polyline_map.go index d03ecdf..a9aa355 100644 --- a/internal/gen/strava-api-go/models/polyline_map.go +++ b/internal/gen/strava-api-go/models/polyline_map.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model polylineMap type PolylineMap struct { + // The identifier of the map ID string `json:"id,omitempty"` diff --git a/internal/gen/strava-api-go/models/power_stream.go b/internal/gen/strava-api-go/models/power_stream.go index 2fde5d4..54defd1 100644 --- a/internal/gen/strava-api-go/models/power_stream.go +++ b/internal/gen/strava-api-go/models/power_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/power_zone_ranges.go b/internal/gen/strava-api-go/models/power_zone_ranges.go index 738a826..cca121c 100644 --- a/internal/gen/strava-api-go/models/power_zone_ranges.go +++ b/internal/gen/strava-api-go/models/power_zone_ranges.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -18,6 +15,7 @@ import ( // // swagger:model powerZoneRanges type PowerZoneRanges struct { + // zones Zones ZoneRanges `json:"zones,omitempty"` } @@ -72,6 +70,7 @@ func (m *PowerZoneRanges) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *PowerZoneRanges) contextValidateZones(ctx context.Context, formats strfmt.Registry) error { + if err := m.Zones.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { diff --git a/internal/gen/strava-api-go/models/route.go b/internal/gen/strava-api-go/models/route.go index b396ab4..7b23e15 100644 --- a/internal/gen/strava-api-go/models/route.go +++ b/internal/gen/strava-api-go/models/route.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -20,6 +17,7 @@ import ( // // swagger:model route type Route struct { + // athlete Athlete *CommentAthlete `json:"athlete,omitempty"` @@ -275,6 +273,7 @@ func (m *Route) ContextValidate(ctx context.Context, formats strfmt.Registry) er } func (m *Route) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { + if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -299,6 +298,7 @@ func (m *Route) contextValidateAthlete(ctx context.Context, formats strfmt.Regis } func (m *Route) contextValidateMap(ctx context.Context, formats strfmt.Registry) error { + if m.Map != nil { if swag.IsZero(m.Map) { // not required @@ -323,7 +323,9 @@ func (m *Route) contextValidateMap(ctx context.Context, formats strfmt.Registry) } func (m *Route) contextValidateSegments(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.Segments); i++ { + if m.Segments[i] != nil { if swag.IsZero(m.Segments[i]) { // not required @@ -343,13 +345,16 @@ func (m *Route) contextValidateSegments(ctx context.Context, formats strfmt.Regi return err } } + } return nil } func (m *Route) contextValidateWaypoints(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.Waypoints); i++ { + if m.Waypoints[i] != nil { if swag.IsZero(m.Waypoints[i]) { // not required @@ -369,6 +374,7 @@ func (m *Route) contextValidateWaypoints(ctx context.Context, formats strfmt.Reg return err } } + } return nil diff --git a/internal/gen/strava-api-go/models/smooth_grade_stream.go b/internal/gen/strava-api-go/models/smooth_grade_stream.go index d40c827..a6b585b 100644 --- a/internal/gen/strava-api-go/models/smooth_grade_stream.go +++ b/internal/gen/strava-api-go/models/smooth_grade_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/smooth_velocity_stream.go b/internal/gen/strava-api-go/models/smooth_velocity_stream.go index 82b4b9d..4109c8d 100644 --- a/internal/gen/strava-api-go/models/smooth_velocity_stream.go +++ b/internal/gen/strava-api-go/models/smooth_velocity_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/split.go b/internal/gen/strava-api-go/models/split.go index 8910a91..a1cd0eb 100644 --- a/internal/gen/strava-api-go/models/split.go +++ b/internal/gen/strava-api-go/models/split.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model split type Split struct { + // The average speed of this split, in meters per second AverageSpeed float32 `json:"average_speed,omitempty"` diff --git a/internal/gen/strava-api-go/models/sport_type.go b/internal/gen/strava-api-go/models/sport_type.go index e254c21..e0a673e 100644 --- a/internal/gen/strava-api-go/models/sport_type.go +++ b/internal/gen/strava-api-go/models/sport_type.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -39,12 +36,21 @@ const ( // SportTypeBadminton captures enum value "Badminton" SportTypeBadminton SportType = "Badminton" + // SportTypeBasketball captures enum value "Basketball" + SportTypeBasketball SportType = "Basketball" + // SportTypeCanoeing captures enum value "Canoeing" SportTypeCanoeing SportType = "Canoeing" + // SportTypeCricket captures enum value "Cricket" + SportTypeCricket SportType = "Cricket" + // SportTypeCrossfit captures enum value "Crossfit" SportTypeCrossfit SportType = "Crossfit" + // SportTypeDance captures enum value "Dance" + SportTypeDance SportType = "Dance" + // SportTypeEBikeRide captures enum value "EBikeRide" SportTypeEBikeRide SportType = "EBikeRide" @@ -87,6 +93,12 @@ const ( // SportTypeNordicSki captures enum value "NordicSki" SportTypeNordicSki SportType = "NordicSki" + // SportTypePadel captures enum value "Padel" + SportTypePadel SportType = "Padel" + + // SportTypePhysicalTherapy captures enum value "PhysicalTherapy" + SportTypePhysicalTherapy SportType = "PhysicalTherapy" + // SportTypePickleball captures enum value "Pickleball" SportTypePickleball SportType = "Pickleball" @@ -162,6 +174,9 @@ const ( // SportTypeVirtualRun captures enum value "VirtualRun" SportTypeVirtualRun SportType = "VirtualRun" + // SportTypeVolleyball captures enum value "Volleyball" + SportTypeVolleyball SportType = "Volleyball" + // SportTypeWalk captures enum value "Walk" SportTypeWalk SportType = "Walk" @@ -186,7 +201,7 @@ var sportTypeEnum []any func init() { var res []SportType - if err := json.Unmarshal([]byte(`["AlpineSki","BackcountrySki","Badminton","Canoeing","Crossfit","EBikeRide","Elliptical","EMountainBikeRide","Golf","GravelRide","Handcycle","HighIntensityIntervalTraining","Hike","IceSkate","InlineSkate","Kayaking","Kitesurf","MountainBikeRide","NordicSki","Pickleball","Pilates","Racquetball","Ride","RockClimbing","RollerSki","Rowing","Run","Sail","Skateboard","Snowboard","Snowshoe","Soccer","Squash","StairStepper","StandUpPaddling","Surfing","Swim","TableTennis","Tennis","TrailRun","Velomobile","VirtualRide","VirtualRow","VirtualRun","Walk","WeightTraining","Wheelchair","Windsurf","Workout","Yoga"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["AlpineSki","BackcountrySki","Badminton","Basketball","Canoeing","Cricket","Crossfit","Dance","EBikeRide","Elliptical","EMountainBikeRide","Golf","GravelRide","Handcycle","HighIntensityIntervalTraining","Hike","IceSkate","InlineSkate","Kayaking","Kitesurf","MountainBikeRide","NordicSki","Padel","PhysicalTherapy","Pickleball","Pilates","Racquetball","Ride","RockClimbing","RollerSki","Rowing","Run","Sail","Skateboard","Snowboard","Snowshoe","Soccer","Squash","StairStepper","StandUpPaddling","Surfing","Swim","TableTennis","Tennis","TrailRun","Velomobile","VirtualRide","VirtualRow","VirtualRun","Volleyball","Walk","WeightTraining","Wheelchair","Windsurf","Workout","Yoga"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/internal/gen/strava-api-go/models/stream_set.go b/internal/gen/strava-api-go/models/stream_set.go index f14b8db..619ffa6 100644 --- a/internal/gen/strava-api-go/models/stream_set.go +++ b/internal/gen/strava-api-go/models/stream_set.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -18,6 +15,7 @@ import ( // // swagger:model streamSet type StreamSet struct { + // altitude Altitude *AltitudeStream `json:"altitude,omitempty"` @@ -414,6 +412,7 @@ func (m *StreamSet) ContextValidate(ctx context.Context, formats strfmt.Registry } func (m *StreamSet) contextValidateAltitude(ctx context.Context, formats strfmt.Registry) error { + if m.Altitude != nil { if swag.IsZero(m.Altitude) { // not required @@ -438,6 +437,7 @@ func (m *StreamSet) contextValidateAltitude(ctx context.Context, formats strfmt. } func (m *StreamSet) contextValidateCadence(ctx context.Context, formats strfmt.Registry) error { + if m.Cadence != nil { if swag.IsZero(m.Cadence) { // not required @@ -462,6 +462,7 @@ func (m *StreamSet) contextValidateCadence(ctx context.Context, formats strfmt.R } func (m *StreamSet) contextValidateDistance(ctx context.Context, formats strfmt.Registry) error { + if m.Distance != nil { if swag.IsZero(m.Distance) { // not required @@ -486,6 +487,7 @@ func (m *StreamSet) contextValidateDistance(ctx context.Context, formats strfmt. } func (m *StreamSet) contextValidateGradeSmooth(ctx context.Context, formats strfmt.Registry) error { + if m.GradeSmooth != nil { if swag.IsZero(m.GradeSmooth) { // not required @@ -510,6 +512,7 @@ func (m *StreamSet) contextValidateGradeSmooth(ctx context.Context, formats strf } func (m *StreamSet) contextValidateHeartrate(ctx context.Context, formats strfmt.Registry) error { + if m.Heartrate != nil { if swag.IsZero(m.Heartrate) { // not required @@ -534,6 +537,7 @@ func (m *StreamSet) contextValidateHeartrate(ctx context.Context, formats strfmt } func (m *StreamSet) contextValidateLatlng(ctx context.Context, formats strfmt.Registry) error { + if m.Latlng != nil { if swag.IsZero(m.Latlng) { // not required @@ -558,6 +562,7 @@ func (m *StreamSet) contextValidateLatlng(ctx context.Context, formats strfmt.Re } func (m *StreamSet) contextValidateMoving(ctx context.Context, formats strfmt.Registry) error { + if m.Moving != nil { if swag.IsZero(m.Moving) { // not required @@ -582,6 +587,7 @@ func (m *StreamSet) contextValidateMoving(ctx context.Context, formats strfmt.Re } func (m *StreamSet) contextValidateTemp(ctx context.Context, formats strfmt.Registry) error { + if m.Temp != nil { if swag.IsZero(m.Temp) { // not required @@ -606,6 +612,7 @@ func (m *StreamSet) contextValidateTemp(ctx context.Context, formats strfmt.Regi } func (m *StreamSet) contextValidateTime(ctx context.Context, formats strfmt.Registry) error { + if m.Time != nil { if swag.IsZero(m.Time) { // not required @@ -630,6 +637,7 @@ func (m *StreamSet) contextValidateTime(ctx context.Context, formats strfmt.Regi } func (m *StreamSet) contextValidateVelocitySmooth(ctx context.Context, formats strfmt.Registry) error { + if m.VelocitySmooth != nil { if swag.IsZero(m.VelocitySmooth) { // not required @@ -654,6 +662,7 @@ func (m *StreamSet) contextValidateVelocitySmooth(ctx context.Context, formats s } func (m *StreamSet) contextValidateWatts(ctx context.Context, formats strfmt.Registry) error { + if m.Watts != nil { if swag.IsZero(m.Watts) { // not required diff --git a/internal/gen/strava-api-go/models/summary_activity.go b/internal/gen/strava-api-go/models/summary_activity.go index 1e0b4ff..90dc8fa 100644 --- a/internal/gen/strava-api-go/models/summary_activity.go +++ b/internal/gen/strava-api-go/models/summary_activity.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -595,6 +592,7 @@ func (m *SummaryActivity) Validate(formats strfmt.Registry) error { } func (m *SummaryActivity) validateAthlete(formats strfmt.Registry) error { + if swag.IsZero(m.Athlete) { // not required return nil } @@ -618,6 +616,7 @@ func (m *SummaryActivity) validateAthlete(formats strfmt.Registry) error { } func (m *SummaryActivity) validateAthleteCount(formats strfmt.Registry) error { + if swag.IsZero(m.AthleteCount) { // not required return nil } @@ -630,6 +629,7 @@ func (m *SummaryActivity) validateAthleteCount(formats strfmt.Registry) error { } func (m *SummaryActivity) validateEndLatlng(formats strfmt.Registry) error { + if swag.IsZero(m.EndLatlng) { // not required return nil } @@ -651,6 +651,7 @@ func (m *SummaryActivity) validateEndLatlng(formats strfmt.Registry) error { } func (m *SummaryActivity) validateMap(formats strfmt.Registry) error { + if swag.IsZero(m.Map) { // not required return nil } @@ -674,6 +675,7 @@ func (m *SummaryActivity) validateMap(formats strfmt.Registry) error { } func (m *SummaryActivity) validateSportType(formats strfmt.Registry) error { + if swag.IsZero(m.SportType) { // not required return nil } @@ -695,6 +697,7 @@ func (m *SummaryActivity) validateSportType(formats strfmt.Registry) error { } func (m *SummaryActivity) validateStartDate(formats strfmt.Registry) error { + if swag.IsZero(m.StartDate) { // not required return nil } @@ -707,6 +710,7 @@ func (m *SummaryActivity) validateStartDate(formats strfmt.Registry) error { } func (m *SummaryActivity) validateStartDateLocal(formats strfmt.Registry) error { + if swag.IsZero(m.StartDateLocal) { // not required return nil } @@ -719,6 +723,7 @@ func (m *SummaryActivity) validateStartDateLocal(formats strfmt.Registry) error } func (m *SummaryActivity) validateStartLatlng(formats strfmt.Registry) error { + if swag.IsZero(m.StartLatlng) { // not required return nil } @@ -740,6 +745,7 @@ func (m *SummaryActivity) validateStartLatlng(formats strfmt.Registry) error { } func (m *SummaryActivity) validateType(formats strfmt.Registry) error { + if swag.IsZero(m.Type) { // not required return nil } @@ -804,6 +810,7 @@ func (m *SummaryActivity) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *SummaryActivity) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { + if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -828,6 +835,7 @@ func (m *SummaryActivity) contextValidateAthlete(ctx context.Context, formats st } func (m *SummaryActivity) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -845,6 +853,7 @@ func (m *SummaryActivity) contextValidateEndLatlng(ctx context.Context, formats } func (m *SummaryActivity) contextValidateMap(ctx context.Context, formats strfmt.Registry) error { + if m.Map != nil { if swag.IsZero(m.Map) { // not required @@ -869,6 +878,7 @@ func (m *SummaryActivity) contextValidateMap(ctx context.Context, formats strfmt } func (m *SummaryActivity) contextValidateSportType(ctx context.Context, formats strfmt.Registry) error { + if swag.IsZero(m.SportType) { // not required return nil } @@ -890,6 +900,7 @@ func (m *SummaryActivity) contextValidateSportType(ctx context.Context, formats } func (m *SummaryActivity) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -907,6 +918,7 @@ func (m *SummaryActivity) contextValidateStartLatlng(ctx context.Context, format } func (m *SummaryActivity) contextValidateType(ctx context.Context, formats strfmt.Registry) error { + if swag.IsZero(m.Type) { // not required return nil } diff --git a/internal/gen/strava-api-go/models/summary_athlete.go b/internal/gen/strava-api-go/models/summary_athlete.go index 2c85b71..171991b 100644 --- a/internal/gen/strava-api-go/models/summary_athlete.go +++ b/internal/gen/strava-api-go/models/summary_athlete.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -233,6 +230,7 @@ func (m *SummaryAthlete) Validate(formats strfmt.Registry) error { } func (m *SummaryAthlete) validateCreatedAt(formats strfmt.Registry) error { + if swag.IsZero(m.CreatedAt) { // not required return nil } @@ -265,6 +263,7 @@ func (m *SummaryAthlete) validateSexEnum(path, location string, value string) er } func (m *SummaryAthlete) validateSex(formats strfmt.Registry) error { + if swag.IsZero(m.Sex) { // not required return nil } @@ -278,6 +277,7 @@ func (m *SummaryAthlete) validateSex(formats strfmt.Registry) error { } func (m *SummaryAthlete) validateUpdatedAt(formats strfmt.Registry) error { + if swag.IsZero(m.UpdatedAt) { // not required return nil } diff --git a/internal/gen/strava-api-go/models/summary_club.go b/internal/gen/strava-api-go/models/summary_club.go index c0855eb..f4d8a0c 100644 --- a/internal/gen/strava-api-go/models/summary_club.go +++ b/internal/gen/strava-api-go/models/summary_club.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -229,11 +226,13 @@ func (m *SummaryClub) Validate(formats strfmt.Registry) error { } func (m *SummaryClub) validateActivityTypes(formats strfmt.Registry) error { + if swag.IsZero(m.ActivityTypes) { // not required return nil } for i := 0; i < len(m.ActivityTypes); i++ { + if err := m.ActivityTypes[i].Validate(formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -246,6 +245,7 @@ func (m *SummaryClub) validateActivityTypes(formats strfmt.Registry) error { return err } + } return nil @@ -272,6 +272,7 @@ func (m *SummaryClub) validateSportTypeEnum(path, location string, value string) } func (m *SummaryClub) validateSportType(formats strfmt.Registry) error { + if swag.IsZero(m.SportType) { // not required return nil } @@ -304,6 +305,7 @@ func (m *SummaryClub) ContextValidate(ctx context.Context, formats strfmt.Regist } func (m *SummaryClub) contextValidateActivityTypes(ctx context.Context, formats strfmt.Registry) error { + for i := 0; i < len(m.ActivityTypes); i++ { if swag.IsZero(m.ActivityTypes[i]) { // not required diff --git a/internal/gen/strava-api-go/models/summary_gear.go b/internal/gen/strava-api-go/models/summary_gear.go index fb7ee4a..878a7a5 100644 --- a/internal/gen/strava-api-go/models/summary_gear.go +++ b/internal/gen/strava-api-go/models/summary_gear.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model summaryGear type SummaryGear struct { + // The distance logged with this gear. Distance float32 `json:"distance,omitempty"` diff --git a/internal/gen/strava-api-go/models/summary_p_r_segment_effort.go b/internal/gen/strava-api-go/models/summary_p_r_segment_effort.go index 3cc47bf..37fab65 100644 --- a/internal/gen/strava-api-go/models/summary_p_r_segment_effort.go +++ b/internal/gen/strava-api-go/models/summary_p_r_segment_effort.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -18,6 +15,7 @@ import ( // // swagger:model summaryPRSegmentEffort type SummaryPRSegmentEffort struct { + // Number of efforts by the authenticated athlete on this segment. EffortCount int64 `json:"effort_count,omitempty"` diff --git a/internal/gen/strava-api-go/models/summary_segment.go b/internal/gen/strava-api-go/models/summary_segment.go index ff3c3cf..89daa5f 100644 --- a/internal/gen/strava-api-go/models/summary_segment.go +++ b/internal/gen/strava-api-go/models/summary_segment.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" "encoding/json" @@ -20,6 +17,7 @@ import ( // // swagger:model summarySegment type SummarySegment struct { + // activity type // Enum: ["Ride","Run"] ActivityType string `json:"activity_type,omitempty"` @@ -260,6 +258,7 @@ func (m *SummarySegment) ContextValidate(ctx context.Context, formats strfmt.Reg } func (m *SummarySegment) contextValidateAthletePrEffort(ctx context.Context, formats strfmt.Registry) error { + if m.AthletePrEffort != nil { if swag.IsZero(m.AthletePrEffort) { // not required @@ -284,6 +283,7 @@ func (m *SummarySegment) contextValidateAthletePrEffort(ctx context.Context, for } func (m *SummarySegment) contextValidateAthleteSegmentStats(ctx context.Context, formats strfmt.Registry) error { + if m.AthleteSegmentStats != nil { if swag.IsZero(m.AthleteSegmentStats) { // not required @@ -308,6 +308,7 @@ func (m *SummarySegment) contextValidateAthleteSegmentStats(ctx context.Context, } func (m *SummarySegment) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -325,6 +326,7 @@ func (m *SummarySegment) contextValidateEndLatlng(ctx context.Context, formats s } func (m *SummarySegment) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { diff --git a/internal/gen/strava-api-go/models/summary_segment_effort.go b/internal/gen/strava-api-go/models/summary_segment_effort.go index ff7295a..09a1c02 100644 --- a/internal/gen/strava-api-go/models/summary_segment_effort.go +++ b/internal/gen/strava-api-go/models/summary_segment_effort.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -18,6 +15,7 @@ import ( // // swagger:model summarySegmentEffort type SummarySegmentEffort struct { + // The unique identifier of the activity related to this effort ActivityID int64 `json:"activity_id,omitempty"` diff --git a/internal/gen/strava-api-go/models/temperature_stream.go b/internal/gen/strava-api-go/models/temperature_stream.go index 2b53483..1e866d5 100644 --- a/internal/gen/strava-api-go/models/temperature_stream.go +++ b/internal/gen/strava-api-go/models/temperature_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/time_stream.go b/internal/gen/strava-api-go/models/time_stream.go index 1758225..569dbd7 100644 --- a/internal/gen/strava-api-go/models/time_stream.go +++ b/internal/gen/strava-api-go/models/time_stream.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/timed_zone_distribution.go b/internal/gen/strava-api-go/models/timed_zone_distribution.go index 8473ac0..6eb0055 100644 --- a/internal/gen/strava-api-go/models/timed_zone_distribution.go +++ b/internal/gen/strava-api-go/models/timed_zone_distribution.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -57,6 +54,7 @@ func (m TimedZoneDistribution) ContextValidate(ctx context.Context, formats strf var res []error for i := 0; i < len(m); i++ { + if m[i] != nil { if swag.IsZero(m[i]) { // not required @@ -76,6 +74,7 @@ func (m TimedZoneDistribution) ContextValidate(ctx context.Context, formats strf return err } } + } if len(res) > 0 { diff --git a/internal/gen/strava-api-go/models/timed_zone_range.go b/internal/gen/strava-api-go/models/timed_zone_range.go index b7f2efb..c99ed58 100644 --- a/internal/gen/strava-api-go/models/timed_zone_range.go +++ b/internal/gen/strava-api-go/models/timed_zone_range.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" diff --git a/internal/gen/strava-api-go/models/updatable_activity.go b/internal/gen/strava-api-go/models/updatable_activity.go index 9e8baea..164dc16 100644 --- a/internal/gen/strava-api-go/models/updatable_activity.go +++ b/internal/gen/strava-api-go/models/updatable_activity.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -18,6 +15,7 @@ import ( // // swagger:model updatableActivity type UpdatableActivity struct { + // Whether this activity is a commute Commute bool `json:"commute,omitempty"` @@ -122,6 +120,7 @@ func (m *UpdatableActivity) ContextValidate(ctx context.Context, formats strfmt. } func (m *UpdatableActivity) contextValidateSportType(ctx context.Context, formats strfmt.Registry) error { + if swag.IsZero(m.SportType) { // not required return nil } @@ -143,6 +142,7 @@ func (m *UpdatableActivity) contextValidateSportType(ctx context.Context, format } func (m *UpdatableActivity) contextValidateType(ctx context.Context, formats strfmt.Registry) error { + if swag.IsZero(m.Type) { // not required return nil } diff --git a/internal/gen/strava-api-go/models/upload.go b/internal/gen/strava-api-go/models/upload.go index 47e4438..f378cd6 100644 --- a/internal/gen/strava-api-go/models/upload.go +++ b/internal/gen/strava-api-go/models/upload.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model upload type Upload struct { + // The identifier of the activity this upload resulted into ActivityID int64 `json:"activity_id,omitempty"` diff --git a/internal/gen/strava-api-go/models/waypoint.go b/internal/gen/strava-api-go/models/waypoint.go index cc96eba..467a33b 100644 --- a/internal/gen/strava-api-go/models/waypoint.go +++ b/internal/gen/strava-api-go/models/waypoint.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -19,6 +16,7 @@ import ( // // swagger:model waypoint type Waypoint struct { + // Categories that the waypoint belongs to // Min Items: 0 Categories []string `json:"categories"` @@ -27,7 +25,7 @@ type Waypoint struct { Description string `json:"description,omitempty"` // The number meters along the route that the waypoint is located - DistanceIntoRoute int64 `json:"distance_into_route,omitempty"` + DistanceIntoRoute float32 `json:"distance_into_route,omitempty"` // latlng Latlng LatLng `json:"latlng,omitempty"` @@ -136,6 +134,7 @@ func (m *Waypoint) ContextValidate(ctx context.Context, formats strfmt.Registry) } func (m *Waypoint) contextValidateLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.Latlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { @@ -153,6 +152,7 @@ func (m *Waypoint) contextValidateLatlng(ctx context.Context, formats strfmt.Reg } func (m *Waypoint) contextValidateTargetLatlng(ctx context.Context, formats strfmt.Registry) error { + if err := m.TargetLatlng.ContextValidate(ctx, formats); err != nil { ve := new(errors.Validation) if stderrors.As(err, &ve) { diff --git a/internal/gen/strava-api-go/models/zone_range.go b/internal/gen/strava-api-go/models/zone_range.go index c7c5f83..68ca667 100644 --- a/internal/gen/strava-api-go/models/zone_range.go +++ b/internal/gen/strava-api-go/models/zone_range.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" @@ -16,6 +13,7 @@ import ( // // swagger:model zoneRange type ZoneRange struct { + // The maximum value in the range. Max int64 `json:"max,omitempty"` diff --git a/internal/gen/strava-api-go/models/zone_ranges.go b/internal/gen/strava-api-go/models/zone_ranges.go index fa09084..a895afc 100644 --- a/internal/gen/strava-api-go/models/zone_ranges.go +++ b/internal/gen/strava-api-go/models/zone_ranges.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -57,6 +54,7 @@ func (m ZoneRanges) ContextValidate(ctx context.Context, formats strfmt.Registry var res []error for i := 0; i < len(m); i++ { + if m[i] != nil { if swag.IsZero(m[i]) { // not required @@ -76,6 +74,7 @@ func (m ZoneRanges) ContextValidate(ctx context.Context, formats strfmt.Registry return err } } + } if len(res) > 0 { diff --git a/internal/gen/strava-api-go/models/zones.go b/internal/gen/strava-api-go/models/zones.go index 593e16f..77846d5 100644 --- a/internal/gen/strava-api-go/models/zones.go +++ b/internal/gen/strava-api-go/models/zones.go @@ -2,9 +2,6 @@ package models -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - import ( "context" stderrors "errors" @@ -18,6 +15,7 @@ import ( // // swagger:model zones type Zones struct { + // heart rate HeartRate *HeartRateZoneRanges `json:"heart_rate,omitempty"` @@ -108,6 +106,7 @@ func (m *Zones) ContextValidate(ctx context.Context, formats strfmt.Registry) er } func (m *Zones) contextValidateHeartRate(ctx context.Context, formats strfmt.Registry) error { + if m.HeartRate != nil { if swag.IsZero(m.HeartRate) { // not required @@ -132,6 +131,7 @@ func (m *Zones) contextValidateHeartRate(ctx context.Context, formats strfmt.Reg } func (m *Zones) contextValidatePower(ctx context.Context, formats strfmt.Registry) error { + if m.Power != nil { if swag.IsZero(m.Power) { // not required diff --git a/scripts/style/fmt.sh b/scripts/style/fmt.sh index f30f3d5..2c12de0 100755 --- a/scripts/style/fmt.sh +++ b/scripts/style/fmt.sh @@ -11,7 +11,7 @@ source "${SCRIPTS_DIR}/helpers-source.sh" echo "${SCRIPT_NAME} is running... " -checkInstalled 'gofumpt' +checkInstalled 'gofmt' echo "Making filelist" GO_FILES=( $(find . -type f -name "*.go" -not -path "./vendor/*" -not -path "./tools/vendor/*" -not -path "./.git/*") ) @@ -21,7 +21,7 @@ echo "Local packages prefix: ${LOCAL_PFX}" for f in "${GO_FILES[@]}"; do echo "Fixing fmt at ${f}" - gofumpt -l -w "$f" + gofmt -l -w "$f" done echo "${SCRIPT_NAME} done." diff --git a/vendor/github.com/go-openapi/analysis/.gitignore b/vendor/github.com/go-openapi/analysis/.gitignore index d8f4186..20c4e0f 100644 --- a/vendor/github.com/go-openapi/analysis/.gitignore +++ b/vendor/github.com/go-openapi/analysis/.gitignore @@ -3,3 +3,5 @@ .idea .env .mcp.json +go.work.sum +.worktrees diff --git a/vendor/github.com/go-openapi/analysis/CONTRIBUTORS.md b/vendor/github.com/go-openapi/analysis/CONTRIBUTORS.md index 2f85f1c..193e460 100644 --- a/vendor/github.com/go-openapi/analysis/CONTRIBUTORS.md +++ b/vendor/github.com/go-openapi/analysis/CONTRIBUTORS.md @@ -4,24 +4,31 @@ | Total Contributors | Total Contributions | | --- | --- | -| 15 | 207 | +| 22 | 266 | | Username | All Time Contribution Count | All Commits | | --- | --- | --- | -| @fredbi | 104 | | -| @casualjim | 70 | | +| @fredbi | 126 | | +| @casualjim | 91 | | | @keramix | 9 | | | @youyuanwu | 8 | | -| @msample | 3 | | +| @wjase | 7 | | | @kul-amr | 3 | | +| @schafle | 3 | | +| @msample | 3 | | | @mbohlool | 2 | | -| @Copilot | 1 | | -| @danielfbm | 1 | | -| @gregmarr | 1 | | -| @guillemj | 1 | | -| @knweiss | 1 | | -| @tklauser | 1 | | -| @cuishuang | 1 | | +| @zmay2030 | 2 | | | @ujjwalsh | 1 | | +| @itengfei | 1 | | +| @nrnrk | 1 | | +| @cuishuang | 1 | | +| @tklauser | 1 | | +| @Shimizu1111 | 1 | | +| @thaJeztah | 1 | | +| @knweiss | 1 | | +| @guillemj | 1 | | +| @gregmarr | 1 | | +| @danielfbm | 1 | | +| @Copilot | 1 | | _this file was generated by the [Contributors GitHub Action](https://github.com/github-community-projects/contributors)_ diff --git a/vendor/github.com/go-openapi/analysis/README.md b/vendor/github.com/go-openapi/analysis/README.md index 82c782f..e4e3086 100644 --- a/vendor/github.com/go-openapi/analysis/README.md +++ b/vendor/github.com/go-openapi/analysis/README.md @@ -12,7 +12,7 @@ --- -A foundational library to analyze an OAI specification document for easier reasoning about the content. +A foundational library to analyze, diff, flatten, merge, and fix OAI specification documents for easier reasoning about the content. ## Announcements @@ -38,6 +38,7 @@ go get github.com/go-openapi/analysis * An analyzer providing methods to walk the functional content of a specification * A spec flattener producing a self-contained document bundle, while preserving `$ref`s +* A spec differ ("diff") to compare two specs and report structural and compatibility changes * A spec merger ("mixin") to merge several spec documents into a primary spec * A spec "fixer" ensuring that response descriptions are non empty diff --git a/vendor/github.com/go-openapi/analysis/analyzer.go b/vendor/github.com/go-openapi/analysis/analyzer.go index 1c91b8c..c24811a 100644 --- a/vendor/github.com/go-openapi/analysis/analyzer.go +++ b/vendor/github.com/go-openapi/analysis/analyzer.go @@ -145,19 +145,27 @@ type Spec struct { enums enumAnalysis allSchemas map[string]SchemaRef allOfs map[string]SchemaRef + mangler mangling.NameMangler } // New takes a swagger spec object and returns an analyzed spec document. // The analyzed document contains a number of indices that make it easier to // reason about semantics of a swagger specification for use in code generation // or validation etc. -func New(doc *spec.Swagger) *Spec { +func New(doc *spec.Swagger, opts ...Option) *Spec { + o := &analyzerOptions{} + for _, opt := range opts { + opt(o) + } + a := &Spec{ spec: doc, references: referenceAnalysis{}, patterns: patternAnalysis{}, enums: enumAnalysis{}, + mangler: mangling.NewNameMangler(o.manglerOpts...), } + a.reset() a.initialize() @@ -288,20 +296,6 @@ func (s *Spec) ProducesFor(operation *spec.Operation) []string { return s.structMapKeys(prod) } -func mapKeyFromParam(param *spec.Parameter) string { - return fmt.Sprintf("%s#%s", param.In, fieldNameFromParam(param)) -} - -func fieldNameFromParam(param *spec.Parameter) string { - // TODO: this should be x-go-name - if nm, ok := param.Extensions.GetString("go-name"); ok { - return nm - } - mangler := mangling.NewNameMangler() - - return mangler.ToGoName(param.Name) -} - // ErrorOnParamFunc is a callback function to be invoked // whenever an error is encountered while resolving references // on parameters. @@ -651,6 +645,19 @@ func (s *Spec) AllEnums() map[string][]any { return cloneEnumMap(s.enums.allEnums) } +func (s *Spec) mapKeyFromParam(param *spec.Parameter) string { + return fmt.Sprintf("%s#%s", param.In, s.fieldNameFromParam(param)) +} + +func (s *Spec) fieldNameFromParam(param *spec.Parameter) string { + // TODO: this should be x-go-name + if nm, ok := param.Extensions.GetString("go-name"); ok { + return nm + } + + return s.mangler.ToGoName(param.Name) +} + func (s *Spec) structMapKeys(mp map[string]struct{}) []string { if len(mp) == 0 { return nil @@ -668,7 +675,7 @@ func (s *Spec) paramsAsMap(parameters []spec.Parameter, res map[string]spec.Para for _, param := range parameters { pr := param if pr.Ref.String() == "" { - res[mapKeyFromParam(&pr)] = pr + res[s.mapKeyFromParam(&pr)] = pr continue } @@ -699,7 +706,7 @@ func (s *Spec) paramsAsMap(parameters []spec.Parameter, res map[string]spec.Para } pr = objAsParam - res[mapKeyFromParam(&pr)] = pr + res[s.mapKeyFromParam(&pr)] = pr } } diff --git a/vendor/github.com/go-openapi/analysis/flatten.go b/vendor/github.com/go-openapi/analysis/flatten.go index d7ee006..1e50166 100644 --- a/vendor/github.com/go-openapi/analysis/flatten.go +++ b/vendor/github.com/go-openapi/analysis/flatten.go @@ -554,6 +554,7 @@ func updateRefParents(allRefs map[string]spec.Ref, r *newRef) { } } +//nolint:gocognit,gocyclo,cyclop // legacy from a lot of design choices that led to concentrate the complexity just here. func stripOAIGenForRef(opts *FlattenOpts, k string, r *newRef) (bool, error) { replacedWithComplex := false diff --git a/vendor/github.com/go-openapi/analysis/flatten_name.go b/vendor/github.com/go-openapi/analysis/flatten_name.go index 922cae5..9d73217 100644 --- a/vendor/github.com/go-openapi/analysis/flatten_name.go +++ b/vendor/github.com/go-openapi/analysis/flatten_name.go @@ -273,9 +273,9 @@ func mangler(o *FlattenOpts) func(string) string { if o.KeepNames { return func(in string) string { return in } } - mangler := mangling.NewNameMangler() + m := mangling.NewNameMangler(o.ManglerOpts...) - return mangler.ToJSONName + return m.ToJSONName } func nameFromRef(ref spec.Ref, o *FlattenOpts) string { diff --git a/vendor/github.com/go-openapi/analysis/flatten_options.go b/vendor/github.com/go-openapi/analysis/flatten_options.go index 23a57ea..0984941 100644 --- a/vendor/github.com/go-openapi/analysis/flatten_options.go +++ b/vendor/github.com/go-openapi/analysis/flatten_options.go @@ -7,6 +7,7 @@ import ( "log" "github.com/go-openapi/spec" + "github.com/go-openapi/swag/mangling" ) // FlattenOpts configuration for flattening a swagger specification. @@ -24,12 +25,13 @@ type FlattenOpts struct { BasePath string // The location of the root document for this spec to resolve relative $ref // Flattening options - Expand bool // When true, skip flattening the spec and expand it instead (if Minimal is false) - Minimal bool // When true, do not decompose complex structures such as allOf - Verbose bool // enable some reporting on possible name conflicts detected - RemoveUnused bool // When true, remove unused parameters, responses and definitions after expansion/flattening - ContinueOnError bool // Continue when spec expansion issues are found - KeepNames bool // Do not attempt to jsonify names from references when flattening + Expand bool // When true, skip flattening the spec and expand it instead (if Minimal is false) + Minimal bool // When true, do not decompose complex structures such as allOf + Verbose bool // enable some reporting on possible name conflicts detected + RemoveUnused bool // When true, remove unused parameters, responses and definitions after expansion/flattening + ContinueOnError bool // Continue when spec expansion issues are found + KeepNames bool // Do not attempt to jsonify names from references when flattening + ManglerOpts []mangling.Option // Options for the name mangler used to jsonify names /* Extra keys */ _ struct{} // require keys diff --git a/vendor/github.com/go-openapi/analysis/go.work.sum b/vendor/github.com/go-openapi/analysis/go.work.sum deleted file mode 100644 index 899a689..0000000 --- a/vendor/github.com/go-openapi/analysis/go.work.sum +++ /dev/null @@ -1,47 +0,0 @@ -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30 h1:BHT1/DKsYDGkUgQ2jmMaozVcdk+sVfz0+1ZJq4zkWgw= -github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= -github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= -github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss= -go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= -golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= -golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= -golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= -golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc= -golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= -golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= -golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= -golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= -golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= -golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 h1:bTLqdHv7xrGlFbvf5/TXNxy/iUwwdkjhqQTJDjW7aj0= -golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4/go.mod h1:g5NllXBEermZrmR51cJDQxmJUHUOfRAaNyWBM+R+548= -golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= -golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU= -golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A= -golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ= -golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= -golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= -golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= diff --git a/vendor/github.com/go-openapi/analysis/mixin.go b/vendor/github.com/go-openapi/analysis/mixin.go index a7a9306..ab15644 100644 --- a/vendor/github.com/go-openapi/analysis/mixin.go +++ b/vendor/github.com/go-openapi/analysis/mixin.go @@ -11,37 +11,66 @@ import ( "github.com/go-openapi/spec" ) -// Mixin modifies the primary swagger spec by adding the paths and -// definitions from the mixin specs. Top level parameters and -// responses from the mixins are also carried over. Operation id -// collisions are avoided by appending "Mixin" but only if -// needed. +// Mixin merges one or more Swagger 2.0 documents into a primary document. // -// The following parts of primary are subject to merge, filling empty details +// # Argument order and precedence // -// - Info +// The first argument is the primary spec, which Mixin modifies in place. +// Subsequent arguments are mixins, listed in decreasing order of priority. +// On any collision, the primary always wins; among mixins, the earliest one +// wins. +// +// Example: given a primary spec with host "a.example.com" and a mixin with +// host "b.example.com", the merged result keeps "a.example.com" (primary +// wins, the mixin value is dropped). Given a primary without a host and a +// mixin with host "b.example.com", the merged result uses "b.example.com" +// (the mixin fills in the empty field on the primary). +// +// # What gets merged +// +// Top-level scalar fields on the primary are filled from the first mixin +// that provides them, but only if the primary's value is the zero value: +// +// - Info (including the nested Contact and License) // - BasePath // - Host // - ExternalDocs // -// Consider calling [FixEmptyResponseDescriptions]() on the modified primary -// if you read them from storage and they are valid to start with. +// Map and slice fields are merged entry by entry. This covers: +// +// - paths, definitions, parameters, responses +// - securityDefinitions, security, tags +// - top-level and Info extensions +// +// Duplicate keys (or equal security requirements, or equal tag names) are +// skipped with a warning; warnings are returned as a slice and intended to +// be inspected by the caller (e.g. compared to an expected collision count +// in build scripts). +// +// Schemes, consumes and produces are merged as the union of distinct +// values. Duplicates there are silently dropped, no warning is emitted. +// +// Operation id collisions are auto-resolved by appending "Mixin" to the +// mixin operation id (N is the mixin index), so the merged spec keeps +// unique operation ids. +// +// # Notes and limitations // -// Entries in "paths", "definitions", "parameters" and "responses" are -// added to the primary in the order of the given mixins. If the entry -// already exists in primary it is skipped with a warning message. +// Consider calling [FixEmptyResponseDescriptions] on the modified primary +// if you read responses from storage and they are valid to start with. // -// The count of skipped entries (from collisions) is returned so any -// deviation from the number expected can flag a warning in your build -// scripts. Carefully review the collisions before accepting them; -// consider renaming things if possible. +// No key normalization takes place. Ensure paths, type names, etc. are +// canonical if your downstream tools rely on normalized forms. // -// No key normalization takes place (paths, type defs, -// etc). Ensure they are canonical if your downstream tools do -// key normalization of any form. +// YAML anchors (& / *) are resolved by the YAML parser before Mixin sees +// the document, so they are not preserved in the merged output, and they +// cannot be shared across input files. Use $ref for cross-file reuse. See +// https://goswagger.io/go-swagger/faq/faq_swagger/#does-swagger-mixin-preserve-yaml-anchors // -// Merging schemes ([http], https), and consumers/producers do not account for -// collisions. +// The order of paths and definitions in the merged output is alphabetical: +// the underlying spec model stores them as Go maps, which serialize with +// sorted keys. Source-file order is not preserved. See +// https://goswagger.io/go-swagger/faq/faq_swagger/#can-i-control-the-path-or-operation-order-in-swagger-mixin-output func Mixin(primary *spec.Swagger, mixins ...*spec.Swagger) []string { skipped := make([]string, 0, len(mixins)) opIDs := getOpIDs(primary) diff --git a/vendor/github.com/go-openapi/analysis/options.go b/vendor/github.com/go-openapi/analysis/options.go new file mode 100644 index 0000000..b46cd2c --- /dev/null +++ b/vendor/github.com/go-openapi/analysis/options.go @@ -0,0 +1,21 @@ +// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers +// SPDX-License-Identifier: Apache-2.0 + +package analysis + +import "github.com/go-openapi/swag/mangling" + +// Option configures the behavior of a new [Spec] analyzer. +type Option func(*analyzerOptions) + +type analyzerOptions struct { + manglerOpts []mangling.Option +} + +// WithManglerOptions sets the name mangler options used when building +// Go identifiers from specification names (e.g. parameter names). +func WithManglerOptions(opts ...mangling.Option) Option { + return func(o *analyzerOptions) { + o.manglerOpts = append(o.manglerOpts, opts...) + } +} diff --git a/vendor/github.com/go-openapi/jsonreference/.gitignore b/vendor/github.com/go-openapi/jsonreference/.gitignore index 885dc27..d8f4186 100644 --- a/vendor/github.com/go-openapi/jsonreference/.gitignore +++ b/vendor/github.com/go-openapi/jsonreference/.gitignore @@ -3,4 +3,3 @@ .idea .env .mcp.json -.claude/ diff --git a/vendor/github.com/go-openapi/jsonreference/CONTRIBUTORS.md b/vendor/github.com/go-openapi/jsonreference/CONTRIBUTORS.md index 7faeb83..3cfbca6 100644 --- a/vendor/github.com/go-openapi/jsonreference/CONTRIBUTORS.md +++ b/vendor/github.com/go-openapi/jsonreference/CONTRIBUTORS.md @@ -4,18 +4,18 @@ | Total Contributors | Total Contributions | | --- | --- | -| 9 | 73 | +| 9 | 79 | | Username | All Time Contribution Count | All Commits | | --- | --- | --- | -| @fredbi | 36 | https://github.com/go-openapi/jsonreference/commits?author=fredbi | -| @casualjim | 25 | https://github.com/go-openapi/jsonreference/commits?author=casualjim | -| @youyuanwu | 5 | https://github.com/go-openapi/jsonreference/commits?author=youyuanwu | -| @olivierlemasle | 2 | https://github.com/go-openapi/jsonreference/commits?author=olivierlemasle | -| @apelisse | 1 | https://github.com/go-openapi/jsonreference/commits?author=apelisse | -| @gbjk | 1 | https://github.com/go-openapi/jsonreference/commits?author=gbjk | -| @honza | 1 | https://github.com/go-openapi/jsonreference/commits?author=honza | -| @Neo2308 | 1 | https://github.com/go-openapi/jsonreference/commits?author=Neo2308 | -| @erraggy | 1 | https://github.com/go-openapi/jsonreference/commits?author=erraggy | +| @fredbi | 42 | | +| @casualjim | 25 | | +| @youyuanwu | 5 | | +| @olivierlemasle | 2 | | +| @apelisse | 1 | | +| @gbjk | 1 | | +| @honza | 1 | | +| @Neo2308 | 1 | | +| @erraggy | 1 | | - _this file was generated by the [Contributors GitHub Action](https://github.com/github/contributors)_ + _this file was generated by the [Contributors GitHub Action](https://github.com/github-community-projects/contributors)_ diff --git a/vendor/github.com/go-openapi/jsonreference/README.md b/vendor/github.com/go-openapi/jsonreference/README.md index adea160..43d05b0 100644 --- a/vendor/github.com/go-openapi/jsonreference/README.md +++ b/vendor/github.com/go-openapi/jsonreference/README.md @@ -14,15 +14,9 @@ An implementation of JSON Reference for golang. + ## Status @@ -74,9 +68,9 @@ on top of which it has been built. ## Other documentation * [All-time contributors](./CONTRIBUTORS.md) -* [Contributing guidelines](.github/CONTRIBUTING.md) -* [Maintainers documentation](docs/MAINTAINERS.md) -* [Code style](docs/STYLE.md) +* [Contributing guidelines][contributing-doc-site] +* [Maintainers documentation][maintainers-doc-site] +* [Code style][style-doc-site] ## Cutting a new release @@ -115,7 +109,7 @@ Maintainers can cut a new release by either: [slack-badge]: https://img.shields.io/badge/slack-blue?link=https%3A%2F%2Fgoswagger.slack.com%2Farchives%2FC04R30YM [slack-url]: https://goswagger.slack.com/archives/C04R30YMU [discord-badge]: https://img.shields.io/discord/1446918742398341256?logo=discord&label=discord&color=blue -[discord-url]: https://discord.gg/twZ9BwT3 +[discord-url]: https://discord.gg/FfnFYaC3k5 [license-badge]: http://img.shields.io/badge/license-Apache%20v2-orange.svg @@ -125,3 +119,7 @@ Maintainers can cut a new release by either: [goversion-url]: https://github.com/go-openapi/jsonreference/blob/master/go.mod [top-badge]: https://img.shields.io/github/languages/top/go-openapi/jsonreference [commits-badge]: https://img.shields.io/github/commits-since/go-openapi/jsonreference/latest + +[contributing-doc-site]: https://go-openapi.github.io/doc-site/contributing/contributing/index.html +[maintainers-doc-site]: https://go-openapi.github.io/doc-site/maintainers/index.html +[style-doc-site]: https://go-openapi.github.io/doc-site/contributing/style/index.html diff --git a/vendor/github.com/go-openapi/strfmt/CONTRIBUTORS.md b/vendor/github.com/go-openapi/strfmt/CONTRIBUTORS.md index a5d5ed6..b6d62d7 100644 --- a/vendor/github.com/go-openapi/strfmt/CONTRIBUTORS.md +++ b/vendor/github.com/go-openapi/strfmt/CONTRIBUTORS.md @@ -4,12 +4,12 @@ | Total Contributors | Total Contributions | | --- | --- | -| 40 | 231 | +| 40 | 234 | | Username | All Time Contribution Count | All Commits | | --- | --- | --- | | @casualjim | 88 | | -| @fredbi | 63 | | +| @fredbi | 66 | | | @youyuanwu | 13 | | | @jlambatl | 9 | | | @GlenDC | 5 | | diff --git a/vendor/github.com/go-openapi/validate/CONTRIBUTORS.md b/vendor/github.com/go-openapi/validate/CONTRIBUTORS.md index 7b79b76..46da879 100644 --- a/vendor/github.com/go-openapi/validate/CONTRIBUTORS.md +++ b/vendor/github.com/go-openapi/validate/CONTRIBUTORS.md @@ -4,12 +4,12 @@ | Total Contributors | Total Contributions | | --- | --- | -| 31 | 295 | +| 31 | 302 | | Username | All Time Contribution Count | All Commits | | --- | --- | --- | | @casualjim | 169 | | -| @fredbi | 58 | | +| @fredbi | 65 | | | @sttts | 11 | | | @youyuanwu | 9 | | | @keramix | 8 | | @@ -40,4 +40,4 @@ | @dadgar | 1 | | | @elakito | 1 | | - _this file was generated by the [Contributors GitHub Action](https://github.com/github/contributors)_ + _this file was generated by the [Contributors GitHub Action](https://github.com/github-community-projects/contributors)_ diff --git a/vendor/github.com/go-openapi/validate/README.md b/vendor/github.com/go-openapi/validate/README.md index fec42b7..17bd03b 100644 --- a/vendor/github.com/go-openapi/validate/README.md +++ b/vendor/github.com/go-openapi/validate/README.md @@ -112,7 +112,7 @@ Maintainers can cut a new release by either: [slack-badge]: https://img.shields.io/badge/slack-blue?link=https%3A%2F%2Fgoswagger.slack.com%2Farchives%2FC04R30YM [slack-url]: https://goswagger.slack.com/archives/C04R30YMU [discord-badge]: https://img.shields.io/discord/1446918742398341256?logo=discord&label=discord&color=blue -[discord-url]: https://discord.gg/twZ9BwT3 +[discord-url]: https://discord.gg/FfnFYaC3k5 [license-badge]: http://img.shields.io/badge/license-Apache%20v2-orange.svg diff --git a/vendor/github.com/obalunenko/getenv/.gitignore b/vendor/github.com/obalunenko/getenv/.gitignore index e948fb7..55fa65f 100644 --- a/vendor/github.com/obalunenko/getenv/.gitignore +++ b/vendor/github.com/obalunenko/getenv/.gitignore @@ -20,4 +20,7 @@ dist/ coverage/ .DS_Store tests-report.json -README_doc.md \ No newline at end of file +README_doc.md +.vscode/ + +linters-report.xml diff --git a/vendor/github.com/obalunenko/getenv/.golangci.pipe.yml b/vendor/github.com/obalunenko/getenv/.golangci.pipe.yml index 1ebe5b2..07b5668 100644 --- a/vendor/github.com/obalunenko/getenv/.golangci.pipe.yml +++ b/vendor/github.com/obalunenko/getenv/.golangci.pipe.yml @@ -1,132 +1,87 @@ -linters: - disable-all: true - enable: - - govet - - errcheck - - gofmt - - revive - - goimports - - unused - - gosimple - -linters-settings: - errcheck: - check-type-assertions: true - check-blank: true - gofmt: - simplify: true - goimports: - local-prefixes: github.com/obalunenko/getenv/ - revive: - # see https://github.com/mgechev/revive#available-rules for details. - ignore-generated-header: true - severity: warning - rules: - - name: indent-error-flow - severity: warning - - name: exported - severity: warning - - name: defer - severity: warning - arguments: [ [ "call-chain", "loop", "method-call", "recover", "return" ] ] - -issues: - # make issues output unique by line, default is true - uniq-by-line: true - exclude-use-default: false - exclude: - # for "public interface + private struct implementation" cases only! - - exported func * returns unexported type *, which can be annoying to use - - should have a package comment, unless it's in another file for this package - # Excluding configuration per-path, per-linter, per-text and per-source - exclude-rules: - # Exclude some linters from running on tests files. - - path: _test\.go - linters: - - gocyclo - - funlen - - dupl - - gosec - - path: internal/input/ - linters: - - gocyclo - - funlen - - godot - - godox - - dupl - - gofmt - - gci - - gofumpt - - goimports - - gosimple - - path: internal/puzzles/constants.go - linters: - - revive - - # Show only new issues: if there are unstaged changes or untracked files, - # only those changes are analyzed, else only changes in HEAD~ are analyzed. - # It's a super-useful option for integration of golangci-lint into existing - # large codebase. It's not practical to fix all existing issues at the moment - # of integration: much better don't allow issues in new code. - # Default is false. - new: true - - # Fix found issues (if it's supported by the linter) - fix: false - - severity: - # Default value is empty string. - # Set the default severity for issues. If severity rules are defined and the issues - # do not match or no severity is provided to the rule this will be the default - # severity applied. Severities should match the supported severity names of the - # selected out format. - # - Code climate: https://docs.codeclimate.com/docs/issues#issue-severity - # - Checkstyle: https://checkstyle.sourceforge.io/property_types.html#severity - # - GitHub: https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message - default-severity: error - - # The default value is false. - # If set to true severity-rules regular expressions become case sensitive. - case-sensitive: false - - # Default value is empty list. - # When a list of severity rules are provided, severity information will be added to lint - # issues. Severity rules have the same filtering capability as exclude rules except you - # are allowed to specify one matcher per severity rule. - # Only affects out formats that support setting severity information. - rules: - - linters: - - dupl - severity: warning - +version: "2" run: issues-exit-code: 1 tests: true - exclude-dirs: - - vendor/ - exclude-files: - - \.pb\.go$ - -# output configuration options output: - # colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions - # default is "colored-line-number" formats: - - format: colored-line-number + text: path: stderr - - format: checkstyle + print-linter-name: true + print-issued-lines: true + checkstyle: path: linters-report.xml - - # print lines of code with issue, default is true - print-issued-lines: true - - # print linter name in the end of issue text, default is true - print-linter-name: true - - # add a prefix to the output file references; default is no prefix path-prefix: "" - - # sorts results by: filepath, line and column - sort-results: true - - +linters: + default: none + enable: + - errcheck + - govet + - revive + - staticcheck + - unused + settings: + errcheck: + check-type-assertions: true + check-blank: true + revive: + severity: warning + rules: + - name: indent-error-flow + severity: warning + - name: exported + severity: warning + - name: defer + arguments: + - - call-chain + - loop + - method-call + - recover + - return + severity: warning + exclusions: + generated: lax + rules: + - linters: + - dupl + - funlen + - gocyclo + - gosec + path: _test\.go + - linters: + - dupl + - funlen + - gocyclo + - godot + - godox + - staticcheck + path: internal/input/ + - linters: + - revive + path: internal/puzzles/constants.go + - path: (.+)\.go$ + text: exported func * returns unexported type *, which can be annoying to use + - path: (.+)\.go$ + text: should have a package comment, unless it's in another file for this package + paths: + - third_party$ + - builtin$ + - examples$ +issues: + uniq-by-line: true +formatters: + enable: + - gofmt + - goimports + settings: + gofmt: + simplify: true + goimports: + local-prefixes: + - github.com/obalunenko/getenv/ + exclusions: + generated: lax + paths: + - third_party$ + - builtin$ + - examples$ + - internal/input/ diff --git a/vendor/github.com/obalunenko/getenv/.golangci.yml b/vendor/github.com/obalunenko/getenv/.golangci.yml index a6c4f99..64f6701 100644 --- a/vendor/github.com/obalunenko/getenv/.golangci.yml +++ b/vendor/github.com/obalunenko/getenv/.golangci.yml @@ -1,356 +1,197 @@ -linters-settings: - depguard: - # new configuration - rules: - logger: - deny: - - pkg: "github.com/sirupsen/logrus" - desc: logging is allowed only by github.com/obalunenko/logger - dupl: - threshold: 100 - funlen: - lines: 100 - statements: 50 - gci: - # Section configuration to compare against. - # Section names are case-insensitive and may contain parameters in (). - # The default order of sections is `standard > default > custom > blank > dot > alias > localmodule`, - # If `custom-order` is `true`, it follows the order of `sections` option. - # Default: ["standard", "default"] - sections: - - standard # Standard section: captures all standard packages. - - default # Default section: contains all imports that could not be matched to another section type. - - prefix(github.com/obalunenko) # Custom section: groups all imports with the specified Prefix. - - localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled. - - # Skip generated files. - # Default: true - skip-generated: true - - # Enable custom order of sections. - # If `true`, make the section order the same as the order of `sections`. - # Default: false - custom-order: true - - # Drops lexical ordering for custom sections. - # Default: false - no-lex-order: true - - goconst: - min-len: 2 - min-occurrences: 2 - gocritic: - enabled-tags: - - diagnostic - - experimental - - opinionated - - performance - - style - disabled-checks: - - dupImport # https://github.com/go-critic/go-critic/issues/845 - - ifElseChain - - hugeParam - - octalLiteral - - wrapperFunc - gocyclo: - min-complexity: 15 - goimports: - local-prefixes: github.com/obalunenko/getenv - mnd: - # List of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description. - # Default: ["argument", "case", "condition", "operation", "return", "assign"] - checks: - - argument - - case - - condition - - operation - - return - - assign - # List of numbers to exclude from analysis. - # The numbers should be written as string. - # Values always ignored: "1", "1.0", "0" and "0.0" - # Default: [] - ignored-numbers: [] - # List of file patterns to exclude from analysis. - # Values always ignored: `.+_test.go` - # Default: [] - ignored-files: [] - # List of function patterns to exclude from analysis. - # Following functions are always ignored: `time.Date`, - # `strconv.FormatInt`, `strconv.FormatUint`, `strconv.FormatFloat`, - # `strconv.ParseInt`, `strconv.ParseUint`, `strconv.ParseFloat`. - # Default: [] - ignored-functions: [] - - govet: - # Disable all analyzers. - # Default: false - disable-all: false - # Enable analyzers by name. - # (in addition to default: - # appends, asmdecl, assign, atomic, bools, buildtag, cgocall, composites, copylocks, defers, directive, errorsas, - # framepointer, httpresponse, ifaceassert, loopclosure, lostcancel, nilfunc, printf, shift, sigchanyzer, slog, - # stdmethods, stringintconv, structtag, testinggoroutine, tests, timeformat, unmarshal, unreachable, unsafeptr, - # unusedresult - # ). - # Run `GL_DEBUG=govet golangci-lint run --enable=govet` to see default, all available analyzers, and enabled analyzers. - # Default: [] - disable: - - fieldalignment - enable: - # Check for missing values after append. - - appends - # Report mismatches between assembly files and Go declarations. - - asmdecl - # Check for useless assignments. - - assign - # Check for common mistakes using the sync/atomic package. - - atomic - # Check for non-64-bits-aligned arguments to sync/atomic functions. - - atomicalign - # Check for common mistakes involving boolean operators. - - bools - # Check //go:build and // +build directives. - - buildtag - # Detect some violations of the cgo pointer passing rules. - - cgocall - # Check for unkeyed composite literals. - - composites - # Check for locks erroneously passed by value. - - copylocks - # Check for calls of reflect.DeepEqual on error values. - - deepequalerrors - # Report common mistakes in defer statements. - - defers - # Check Go toolchain directives such as //go:debug. - - directive - # Report passing non-pointer or non-error values to errors.As. - - errorsas - # Find calls to a particular function. - - findcall - # Report assembly that clobbers the frame pointer before saving it. - - framepointer - # Check for mistakes using HTTP responses. - - httpresponse - # Detect impossible interface-to-interface type assertions. - - ifaceassert - # Check references to loop variables from within nested functions. - - loopclosure - # Check cancel func returned by context.WithCancel is called. - - lostcancel - # Check for useless comparisons between functions and nil. - - nilfunc - # Check for redundant or impossible nil comparisons. - - nilness - # Check consistency of Printf format strings and arguments. - - printf - # Check for comparing reflect.Value values with == or reflect.DeepEqual. - - reflectvaluecompare - # Check for possible unintended shadowing of variables. - - shadow - # Check for shifts that equal or exceed the width of the integer. - - shift - # Check for unbuffered channel of os.Signal. - - sigchanyzer - # Check for invalid structured logging calls. - - slog - # Check the argument type of sort.Slice. - - sortslice - # Check signature of methods of well-known interfaces. - - stdmethods - # Check for string(int) conversions. - - stringintconv - # Check that struct field tags conform to reflect.StructTag.Get. - - structtag - # Report calls to (*testing.T).Fatal from goroutines started by a test. - - testinggoroutine - # Check for common mistaken usages of tests and examples. - - tests - # Check for calls of (time.Time).Format or time.Parse with 2006-02-01. - - timeformat - # Report passing non-pointer or non-interface values to unmarshal. - - unmarshal - # Check for unreachable code. - - unreachable - # Check for invalid conversions of uintptr to unsafe.Pointer. - - unsafeptr - # Check for unused results of calls to some functions. - - unusedresult - # Checks for unused writes. - - unusedwrite - lll: - line-length: 140 - misspell: - locale: US - nolintlint: - allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space) - allow-unused: false # report any unused nolint directives - require-explanation: false # don't require an explanation for nolint directives - require-specific: false # don't require nolint directives to be specific about which linter is being skipped - +version: "2" +run: + issues-exit-code: 0 + tests: true +output: + formats: + text: + path: stderr + print-linter-name: true + print-issued-lines: true + checkstyle: + path: linters-report.xml + sort-order: + - linter + - severity + - file + path-prefix: "" linters: - disable-all: true + default: none enable: - bodyclose + - copyloopvar - depguard - dogsled - dupl - errcheck - - copyloopvar - funlen - gochecknoinits - goconst - gocritic - gocyclo - - gofmt - - goimports - - mnd - goprintffuncname - gosec - - gosimple - govet - ineffassign - lll - misspell + - mnd - nakedret - noctx - nolintlint + - revive - rowserrcheck - staticcheck - - stylecheck - - typecheck - unconvert - unparam - unused - whitespace - - revive - - wsl - - # don't enable: - # - asciicheck - # - scopelint - # - gochecknoglobals - # - gocognit - # - godot - # - godox - # - goerr113 - # - interfacer - # - maligned - # - nestif - # - prealloc - # - testpackage - + - wsl_v5 + settings: + depguard: + rules: + logger: + deny: + - pkg: github.com/sirupsen/logrus + desc: logging is allowed only by github.com/obalunenko/logger + dupl: + threshold: 100 + funlen: + lines: 100 + statements: 50 + goconst: + min-len: 2 + min-occurrences: 2 + gocritic: + disabled-checks: + - dupImport + - ifElseChain + - hugeParam + - octalLiteral + - wrapperFunc + enabled-tags: + - diagnostic + - experimental + - opinionated + - performance + - style + gocyclo: + min-complexity: 15 + govet: + enable: + - appends + - asmdecl + - assign + - atomic + - atomicalign + - bools + - buildtag + - cgocall + - composites + - copylocks + - deepequalerrors + - defers + - directive + - errorsas + - findcall + - framepointer + - httpresponse + - ifaceassert + - loopclosure + - lostcancel + - nilfunc + - nilness + - printf + - reflectvaluecompare + - shadow + - shift + - sigchanyzer + - slog + - sortslice + - stdmethods + - stringintconv + - structtag + - testinggoroutine + - tests + - timeformat + - unmarshal + - unreachable + - unsafeptr + - unusedresult + - unusedwrite + disable: + - fieldalignment + disable-all: false + lll: + line-length: 140 + misspell: + locale: US + mnd: + checks: + - argument + - case + - condition + - operation + - return + - assign + nolintlint: + require-explanation: false + require-specific: false + allow-unused: false + wsl_v5: + allow-first-in-block: true + allow-whole-block: false + branch-max-lines: 2 + exclusions: + generated: lax + rules: + - linters: + - dupl + - funlen + - gocyclo + - gosec + path: _test\.go + - path: (.+)\.go$ + text: exported func * returns unexported type *, which can be annoying to use + - path: (.+)\.go$ + text: should have a package comment, unless it's in another file for this package + paths: + - \.pb\.go$ + - vendor/ + - third_party$ + - builtin$ + - examples$ issues: - # make issues output unique by line, default is true uniq-by-line: true - # Show only new issues: if there are unstaged changes or untracked files, - # only those changes are analyzed, else only changes in HEAD~ are analyzed. - # It's a super-useful option for integration of golangci-lint into existing - # large codebase. It's not practical to fix all existing issues at the moment - # of integration: much better don't allow issues in new code. - # Default is false. new: false - # Fix found issues (if it's supported by the linter) fix: false - exclude-files: - - \.pb\.go$ - exclude-dirs: - - vendor/ - exclude-use-default: false - exclude: - # for "public interface + private struct implementation" cases only! - - exported func * returns unexported type *, which can be annoying to use - - should have a package comment, unless it's in another file for this package - # Excluding configuration per-path, per-linter, per-text and per-source - exclude-rules: - # Exclude some linters from running on tests files. - - path: _test\.go - linters: - - gocyclo - - funlen - - dupl - - gosec - -run: - issues-exit-code: 0 - tests: true - severity: - # Set the default severity for issues. - # - # If severity rules are defined and the issues do not match or no severity is provided to the rule - # this will be the default severity applied. - # Severities should match the supported severity names of the selected out format. - # - Code climate: https://docs.codeclimate.com/docs/issues#issue-severity - # - Checkstyle: https://checkstyle.sourceforge.io/property_types.html#SeverityLevel - # - GitHub: https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message - # - TeamCity: https://www.jetbrains.com/help/teamcity/service-messages.html#Inspection+Instance - # - # `@linter` can be used as severity value to keep the severity from linters (e.g. revive, gosec, ...) - # - # Default: "" - default-severity: error - - # If set to true `severity-rules` regular expressions become case-sensitive. - # Default: false - case-sensitive: true - - # When a list of severity rules are provided, severity information will be added to lint issues. - # Severity rules have the same filtering capability as exclude rules - # except you are allowed to specify one matcher per severity rule. - # - # `@linter` can be used as severity value to keep the severity from linters (e.g. revive, gosec, ...) - # - # Only affects out formats that support setting severity information. - # - # Default: [] + default: error rules: - linters: - dupl severity: info - - -# output configuration options -output: - # colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions - # default is "colored-line-number" - formats: - - format: colored-line-number - path: stderr - - format: checkstyle - path: linters-report.xml - - - # Order to use when sorting results. - # Require `sort-results` to `true`. - # Possible values: `file`, `linter`, and `severity`. - # - # If the severity values are inside the following list, they are ordered in this order: - # 1. error - # 2. warning - # 3. high - # 4. medium - # 5. low - # Either they are sorted alphabetically. - # - # Default: ["file"] - sort-order: - - linter - - severity - - file # filepath, line, and column. - - # Show statistics per linter. - # Default: false - show-stats: true - - # print lines of code with issue, default is true - print-issued-lines: true - - # print linter name in the end of issue text, default is true - print-linter-name: true - - # add a prefix to the output file references; default is no prefix - path-prefix: "" - - # sorts results by: filepath, line and column - sort-results: true +formatters: + enable: + - gofmt + - goimports + settings: + gci: + sections: + - standard + - default + - prefix(github.com/obalunenko) + - localmodule + custom-order: true + no-lex-order: true + goimports: + local-prefixes: + - github.com/obalunenko/getenv + exclusions: + generated: lax + paths: + - \.pb\.go$ + - vendor/ + - third_party$ + - builtin$ + - examples$ diff --git a/vendor/github.com/obalunenko/getenv/Makefile b/vendor/github.com/obalunenko/getenv/Makefile index f281847..0cb5847 100644 --- a/vendor/github.com/obalunenko/getenv/Makefile +++ b/vendor/github.com/obalunenko/getenv/Makefile @@ -14,7 +14,7 @@ COMPOSE_TOOLS_CMD_BASE=docker compose -f $(COMPOSE_TOOLS_FILE) COMPOSE_TOOLS_CMD_UP=$(COMPOSE_TOOLS_CMD_BASE) up --exit-code-from COMPOSE_TOOLS_CMD_PULL=$(COMPOSE_TOOLS_CMD_BASE) pull -GOVERSION:=1.24 +GOVERSION:=1.26.2 TARGET_MAX_CHAR_NUM=20 diff --git a/vendor/github.com/obalunenko/getenv/README.md b/vendor/github.com/obalunenko/getenv/README.md index f6e83de..9c2fab5 100644 --- a/vendor/github.com/obalunenko/getenv/README.md +++ b/vendor/github.com/obalunenko/getenv/README.md @@ -9,6 +9,7 @@ Package getenv provides a simple way to get environment variables. It's type-safe and supports built-in types and slices of them. +Empty environment variable values are treated as not set. Types supported: - string diff --git a/vendor/github.com/obalunenko/getenv/getenv.go b/vendor/github.com/obalunenko/getenv/getenv.go index 0ca9ae8..9e3ac13 100644 --- a/vendor/github.com/obalunenko/getenv/getenv.go +++ b/vendor/github.com/obalunenko/getenv/getenv.go @@ -1,5 +1,6 @@ // Package getenv provides a simple way to get environment variables. // It's type-safe and supports built-in types and slices of them. +// Note: empty environment variable values are treated as "not set". // // Types supported: // - string @@ -77,6 +78,10 @@ func Env[T internal.EnvParsable](key string, options ...option.Option) (T, error return t, fmt.Errorf("failed to get environment variable[%s]: %w", key, ErrNotSet) } + if errors.Is(err, internal.ErrInvalidValue) { + return t, fmt.Errorf("failed to parse environment variable[%s]: %w", key, ErrInvalidValue) + } + return t, fmt.Errorf("failed to parse environment variable[%s]: %w", key, err) } diff --git a/vendor/github.com/obalunenko/getenv/internal/constraint.go b/vendor/github.com/obalunenko/getenv/internal/constraint.go index dace7b4..7e545fb 100644 --- a/vendor/github.com/obalunenko/getenv/internal/constraint.go +++ b/vendor/github.com/obalunenko/getenv/internal/constraint.go @@ -4,8 +4,6 @@ import ( "net" "net/url" "time" - - "golang.org/x/exp/constraints" ) type ( @@ -29,24 +27,30 @@ type ( IntSlice | FloatSlice | UintSlice } - // Int is a constraint for integer and slice of integers. - Int = constraints.Signed + // Int is a constraint for integer scalar types. + Int interface { + int | int8 | int16 | int32 | int64 + } // IntSlice is a constraint for slice of integers. IntSlice interface { []int | []int8 | []int16 | []int32 | []int64 } - // Uint is a constraint for unsigned integer and slice of unsigned integers. - Uint = constraints.Unsigned + // Uint is a constraint for unsigned integer scalar types. + Uint interface { + uint | uint8 | uint16 | uint32 | uint64 | uintptr + } // UintSlice is a constraint for slice of unsigned integers. UintSlice interface { []uint | []uint8 | []uint16 | []uint32 | []uint64 | []uintptr } - // Float is a constraint for float and slice of floats. - Float = constraints.Float + // Float is a constraint for floating-point scalar types. + Float interface { + float32 | float64 + } // FloatSlice is a constraint for slice of floats. FloatSlice interface { @@ -78,6 +82,8 @@ type ( []complex64 | []complex128 } - // Complex is a constraint for complex and slice of complex. - Complex = constraints.Complex + // Complex is a constraint for complex scalar types. + Complex interface { + complex64 | complex128 + } ) diff --git a/vendor/github.com/obalunenko/getenv/internal/iface.go b/vendor/github.com/obalunenko/getenv/internal/iface.go index cd09539..c8fa999 100644 --- a/vendor/github.com/obalunenko/getenv/internal/iface.go +++ b/vendor/github.com/obalunenko/getenv/internal/iface.go @@ -48,11 +48,11 @@ func newComplexParser(v any) EnvParser { case complex64: return complexParser[complex64]{} case []complex64: - return complexSliceParser[[]complex64, complex64]{} + return complexSliceParser[complex64]{} case complex128: return complexParser[complex128]{} case []complex128: - return complexSliceParser[[]complex128, complex128]{} + return complexSliceParser[complex128]{} default: return nil } @@ -99,23 +99,23 @@ func newIntParser(v any) EnvParser { case int: return numberParser[int]{} case []int: - return numberSliceParser[[]int, int]{} + return numberSliceParser[int]{} case int8: return numberParser[int8]{} case []int8: - return numberSliceParser[[]int8, int8]{} + return numberSliceParser[int8]{} case int16: return numberParser[int16]{} case []int16: - return numberSliceParser[[]int16, int16]{} + return numberSliceParser[int16]{} case int32: return numberParser[int32]{} case []int32: - return numberSliceParser[[]int32, int32]{} + return numberSliceParser[int32]{} case int64: return numberParser[int64]{} case []int64: - return numberSliceParser[[]int64, int64]{} + return numberSliceParser[int64]{} default: return nil } @@ -127,27 +127,27 @@ func newUintParser(v any) EnvParser { case uint8: return numberParser[uint8]{} case []uint8: - return numberSliceParser[[]uint8, uint8]{} + return numberSliceParser[uint8]{} case uint: return numberParser[uint]{} case []uint: - return numberSliceParser[[]uint, uint]{} + return numberSliceParser[uint]{} case uint16: return numberParser[uint16]{} case []uint16: - return numberSliceParser[[]uint16, uint16]{} + return numberSliceParser[uint16]{} case uint32: return numberParser[uint32]{} case []uint32: - return numberSliceParser[[]uint32, uint32]{} + return numberSliceParser[uint32]{} case uint64: return numberParser[uint64]{} case []uint64: - return numberSliceParser[[]uint64, uint64]{} + return numberSliceParser[uint64]{} case uintptr: return numberParser[uintptr]{} case []uintptr: - return numberSliceParser[[]uintptr, uintptr]{} + return numberSliceParser[uintptr]{} default: return nil } @@ -159,11 +159,11 @@ func newFloatParser(v any) EnvParser { case float32: return numberParser[float32]{} case []float32: - return numberSliceParser[[]float32, float32]{} + return numberSliceParser[float32]{} case float64: return numberParser[float64]{} case []float64: - return numberSliceParser[[]float64, float64]{} + return numberSliceParser[float64]{} default: return nil } @@ -224,12 +224,12 @@ func (n numberParser[T]) ParseEnv(key string, _ Parameters) (any, error) { return getNumberGen[T](key) } -type numberSliceParser[S []T, T Number] struct{} +type numberSliceParser[T Number] struct{} -func (i numberSliceParser[S, T]) ParseEnv(key string, options Parameters) (any, error) { +func (i numberSliceParser[T]) ParseEnv(key string, options Parameters) (any, error) { sep := options.Separator - return getNumberSliceGen[S, T](key, sep) + return getNumberSliceGen[T](key, sep) } type boolParser bool @@ -316,10 +316,10 @@ func (n complexParser[T]) ParseEnv(key string, _ Parameters) (any, error) { return getComplexGen[T](key) } -type complexSliceParser[S []T, T Complex] struct{} +type complexSliceParser[T Complex] struct{} -func (i complexSliceParser[S, T]) ParseEnv(key string, options Parameters) (any, error) { +func (i complexSliceParser[T]) ParseEnv(key string, options Parameters) (any, error) { sep := options.Separator - return getComplexSliceGen[S, T](key, sep) + return getComplexSliceGen[T](key, sep) } diff --git a/vendor/github.com/obalunenko/getenv/internal/parsers.go b/vendor/github.com/obalunenko/getenv/internal/parsers.go index e362b60..0cf153e 100644 --- a/vendor/github.com/obalunenko/getenv/internal/parsers.go +++ b/vendor/github.com/obalunenko/getenv/internal/parsers.go @@ -5,12 +5,20 @@ import ( "net" "net/url" "os" - "reflect" "strconv" "strings" "time" ) +const ( + decimalBase = 10 + bitSize8 = 8 + bitSize16 = 16 + bitSize32 = 32 + bitSize64 = 64 + bitSize128 = 128 +) + func getString(key string) (string, error) { env, ok := os.LookupEnv(key) if !ok || env == "" { @@ -76,65 +84,82 @@ func getStringSlice(key, sep string) ([]string, error) { } func parseNumberGen[T Number](raw string) (T, error) { - var tt T - - const ( - base = 10 - ) + var zero T + + switch any(zero).(type) { + case int: + return parseSignedNumber[T](raw, decimalBase, strconv.IntSize) + case int8: + return parseSignedNumber[T](raw, decimalBase, bitSize8) + case int16: + return parseSignedNumber[T](raw, decimalBase, bitSize16) + case int32: + return parseSignedNumber[T](raw, decimalBase, bitSize32) + case int64: + return parseSignedNumber[T](raw, decimalBase, bitSize64) + case uint: + return parseUnsignedNumber[T](raw, decimalBase, strconv.IntSize) + case uint8: + return parseUnsignedNumber[T](raw, decimalBase, bitSize8) + case uint16: + return parseUnsignedNumber[T](raw, decimalBase, bitSize16) + case uint32: + return parseUnsignedNumber[T](raw, decimalBase, bitSize32) + case uint64: + return parseUnsignedNumber[T](raw, decimalBase, bitSize64) + case uintptr: + return parseUnsignedNumber[T](raw, decimalBase, strconv.IntSize) + case float32: + return parseFloatNumber[T](raw, bitSize32) + case float64: + return parseFloatNumber[T](raw, bitSize64) + default: + return zero, ErrInvalidValue + } +} - rt := reflect.TypeOf(tt) +func parseSignedNumber[T Number](raw string, base, bits int) (T, error) { + var zero T - switch rt.Kind() { //nolint:exhaustive // All supported types are covered. - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - val, err := strconv.ParseInt(raw, base, rt.Bits()) - if err != nil { - return tt, ErrInvalidValue - } + val, err := strconv.ParseInt(raw, base, bits) + if err != nil { + return zero, ErrInvalidValue + } - res, ok := any(T(val)).(T) - if !ok { - return tt, ErrInvalidValue - } + return T(val), nil +} - return res, nil - case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: - val, err := strconv.ParseUint(raw, base, rt.Bits()) - if err != nil { - return tt, ErrInvalidValue - } +func parseUnsignedNumber[T Number](raw string, base, bits int) (T, error) { + var zero T - res, ok := any(T(val)).(T) - if !ok { - return tt, ErrInvalidValue - } + val, err := strconv.ParseUint(raw, base, bits) + if err != nil { + return zero, ErrInvalidValue + } - return res, nil - case reflect.Float32, reflect.Float64: - val, err := strconv.ParseFloat(raw, rt.Bits()) - if err != nil { - return tt, ErrInvalidValue - } + return T(val), nil +} - res, ok := any(T(val)).(T) - if !ok { - return tt, ErrInvalidValue - } +func parseFloatNumber[T Number](raw string, bits int) (T, error) { + var zero T - return res, nil - default: - return tt, ErrInvalidValue + val, err := strconv.ParseFloat(raw, bits) + if err != nil { + return zero, ErrInvalidValue } + + return T(val), nil } -func parseNumberSliceGen[S []T, T Number](raw []string) (S, error) { - var tt S +func parseNumberSliceGen[T Number](raw []string) ([]T, error) { + var zero []T - val := make(S, 0, len(raw)) + val := make([]T, 0, len(raw)) for _, s := range raw { v, err := parseNumberGen[T](s) if err != nil { - return tt, err + return zero, err } val = append(val, v) @@ -143,13 +168,13 @@ func parseNumberSliceGen[S []T, T Number](raw []string) (S, error) { return val, nil } -func getNumberSliceGen[S []T, T Number](key, sep string) (S, error) { +func getNumberSliceGen[T Number](key, sep string) ([]T, error) { env, err := getStringSlice(key, sep) if err != nil { return nil, err } - return parseNumberSliceGen[S, T](env) + return parseNumberSliceGen[T](env) } func getNumberGen[T Number](key string) (T, error) { @@ -298,39 +323,38 @@ func getIPSlice(key, sep string) ([]net.IP, error) { } func parseComplexGen[T Complex](raw string) (T, error) { - var tt T - - var bitsize int - - switch any(tt).(type) { - case complex64: - bitsize = 64 - case complex128: - bitsize = 128 - } + var zero T - val, err := strconv.ParseComplex(raw, bitsize) + val, err := strconv.ParseComplex(raw, complexBits[T]()) if err != nil { - return tt, newErrInvalidValue(err.Error()) + return zero, newErrInvalidValue(err.Error()) } - res, ok := any(T(val)).(T) - if !ok { - return tt, ErrInvalidValue - } + return T(val), nil +} + +func complexBits[T Complex]() int { + var zero T - return res, nil + switch any(zero).(type) { + case complex64: + return bitSize64 + case complex128: + return bitSize128 + default: + return 0 + } } -func parseComplexSliceGen[S []T, T Complex](raw []string) (S, error) { - var tt S +func parseComplexSliceGen[T Complex](raw []string) ([]T, error) { + var zero []T - val := make(S, 0, len(raw)) + val := make([]T, 0, len(raw)) for _, s := range raw { v, err := parseComplexGen[T](s) if err != nil { - return tt, err + return zero, err } val = append(val, v) @@ -339,13 +363,13 @@ func parseComplexSliceGen[S []T, T Complex](raw []string) (S, error) { return val, nil } -func getComplexSliceGen[S []T, T Complex](key, sep string) (S, error) { +func getComplexSliceGen[T Complex](key, sep string) ([]T, error) { env, err := getStringSlice(key, sep) if err != nil { return nil, err } - return parseComplexSliceGen[S, T](env) + return parseComplexSliceGen[T](env) } func getComplexGen[T Complex](key string) (T, error) { diff --git a/vendor/github.com/obalunenko/getenv/linters-report.xml b/vendor/github.com/obalunenko/getenv/linters-report.xml deleted file mode 100644 index fd4ea08..0000000 --- a/vendor/github.com/obalunenko/getenv/linters-report.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/vendor/golang.org/x/exp/LICENSE b/vendor/golang.org/x/exp/LICENSE deleted file mode 100644 index 2a7cf70..0000000 --- a/vendor/golang.org/x/exp/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright 2009 The Go Authors. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google LLC nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/golang.org/x/exp/PATENTS b/vendor/golang.org/x/exp/PATENTS deleted file mode 100644 index 7330990..0000000 --- a/vendor/golang.org/x/exp/PATENTS +++ /dev/null @@ -1,22 +0,0 @@ -Additional IP Rights Grant (Patents) - -"This implementation" means the copyrightable works distributed by -Google as part of the Go project. - -Google hereby grants to You a perpetual, worldwide, non-exclusive, -no-charge, royalty-free, irrevocable (except as stated in this section) -patent license to make, have made, use, offer to sell, sell, import, -transfer and otherwise run, modify and propagate the contents of this -implementation of Go, where such license applies only to those patent -claims, both currently owned or controlled by Google and acquired in -the future, licensable by Google that are necessarily infringed by this -implementation of Go. This grant does not include claims that would be -infringed only as a consequence of further modification of this -implementation. If you or your agent or exclusive licensee institute or -order or agree to the institution of patent litigation against any -entity (including a cross-claim or counterclaim in a lawsuit) alleging -that this implementation of Go or any code incorporated within this -implementation of Go constitutes direct or contributory patent -infringement, or inducement of patent infringement, then any patent -rights granted to you under this License for this implementation of Go -shall terminate as of the date such litigation is filed. diff --git a/vendor/golang.org/x/exp/constraints/constraints.go b/vendor/golang.org/x/exp/constraints/constraints.go deleted file mode 100644 index a9392af..0000000 --- a/vendor/golang.org/x/exp/constraints/constraints.go +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2021 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package constraints defines a set of useful constraints to be used -// with type parameters. -package constraints - -// Signed is a constraint that permits any signed integer type. -// If future releases of Go add new predeclared signed integer types, -// this constraint will be modified to include them. -type Signed interface { - ~int | ~int8 | ~int16 | ~int32 | ~int64 -} - -// Unsigned is a constraint that permits any unsigned integer type. -// If future releases of Go add new predeclared unsigned integer types, -// this constraint will be modified to include them. -type Unsigned interface { - ~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~uintptr -} - -// Integer is a constraint that permits any integer type. -// If future releases of Go add new predeclared integer types, -// this constraint will be modified to include them. -type Integer interface { - Signed | Unsigned -} - -// Float is a constraint that permits any floating-point type. -// If future releases of Go add new predeclared floating-point types, -// this constraint will be modified to include them. -type Float interface { - ~float32 | ~float64 -} - -// Complex is a constraint that permits any complex numeric type. -// If future releases of Go add new predeclared complex numeric types, -// this constraint will be modified to include them. -type Complex interface { - ~complex64 | ~complex128 -} - -// Ordered is a constraint that permits any ordered type: any type -// that supports the operators < <= >= >. -// If future releases of Go add new ordered types, -// this constraint will be modified to include them. -// -// This type is redundant since Go 1.21 introduced [cmp.Ordered]. -type Ordered interface { - Integer | Float | ~string -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 13aec7f..43fdd1e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -11,7 +11,7 @@ github.com/go-logr/logr/funcr # github.com/go-logr/stdr v1.2.2 ## explicit; go 1.16 github.com/go-logr/stdr -# github.com/go-openapi/analysis v0.25.0 +# github.com/go-openapi/analysis v0.25.1 ## explicit; go 1.25.0 github.com/go-openapi/analysis github.com/go-openapi/analysis/internal/debug @@ -26,8 +26,8 @@ github.com/go-openapi/errors # github.com/go-openapi/jsonpointer v0.23.1 ## explicit; go 1.25.0 github.com/go-openapi/jsonpointer -# github.com/go-openapi/jsonreference v0.21.5 -## explicit; go 1.24.0 +# github.com/go-openapi/jsonreference v0.21.6 +## explicit; go 1.25.0 github.com/go-openapi/jsonreference github.com/go-openapi/jsonreference/internal # github.com/go-openapi/loads v0.23.3 @@ -53,7 +53,7 @@ github.com/go-openapi/runtime/server-middleware/negotiate/header # github.com/go-openapi/spec v0.22.4 ## explicit; go 1.24.0 github.com/go-openapi/spec -# github.com/go-openapi/strfmt v0.26.2 +# github.com/go-openapi/strfmt v0.26.3 ## explicit; go 1.25.0 github.com/go-openapi/strfmt github.com/go-openapi/strfmt/internal/bsonlite @@ -96,8 +96,8 @@ github.com/go-openapi/swag/typeutils # github.com/go-openapi/swag/yamlutils v0.26.0 ## explicit; go 1.25.0 github.com/go-openapi/swag/yamlutils -# github.com/go-openapi/validate v0.25.2 -## explicit; go 1.24.0 +# github.com/go-openapi/validate v0.25.3 +## explicit; go 1.25.0 github.com/go-openapi/validate # github.com/go-viper/mapstructure/v2 v2.5.0 ## explicit; go 1.18 @@ -106,8 +106,8 @@ github.com/go-viper/mapstructure/v2/internal/errors # github.com/google/uuid v1.6.0 ## explicit github.com/google/uuid -# github.com/obalunenko/getenv v1.14.1 -## explicit; go 1.24 +# github.com/obalunenko/getenv v1.14.2 +## explicit; go 1.26.2 github.com/obalunenko/getenv github.com/obalunenko/getenv/internal github.com/obalunenko/getenv/option @@ -153,10 +153,7 @@ go.opentelemetry.io/otel/trace/noop # go.yaml.in/yaml/v3 v3.0.4 ## explicit; go 1.16 go.yaml.in/yaml/v3 -# golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa -## explicit; go 1.23.0 -golang.org/x/exp/constraints -# golang.org/x/net v0.54.0 +# golang.org/x/net v0.55.0 ## explicit; go 1.25.0 golang.org/x/net/idna # golang.org/x/sync v0.20.0