particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kojiapi: move api definition

Browse source 
Move the API definition into a sub-directory to follow the style
of the worker API.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-09-17 01:55:42 +01:00
parent 369d5d3e4d
commit 504a5890d9
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/kojiapi/openapi.gen.go → internal/kojiapi/api/api.gen.go
View file

@ -1,7 +1,7 @@
// Package kojiapi provides primitives to interact the openapi HTTP API. // Package api provides primitives to interact the openapi HTTP API.
// //
// Code generated by github.com/deepmap/oapi-codegen DO NOT EDIT. // Code generated by github.com/deepmap/oapi-codegen DO NOT EDIT.
package kojiapi package api
import ( import (
"bytes" "bytes"

3
internal/kojiapi/api/api.go Normal file
View file

@ -0,0 +1,3 @@
//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --package=api --generate types,chi-server,client -o api.gen.go openapi.yml
package api

0
internal/kojiapi/openapi.yml → internal/kojiapi/api/openapi.yml
View file

13
internal/kojiapi/server.go
View file

@ -1,5 +1,3 @@
//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --package=kojiapi --generate types,chi-server,client -o openapi.gen.go openapi.yml
// Package kojiapi provides a REST API to build and push images to Koji // Package kojiapi provides a REST API to build and push images to Koji
package kojiapi package kojiapi
@ -16,6 +14,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/blueprint" "github.com/osbuild/osbuild-composer/internal/blueprint"
"github.com/osbuild/osbuild-composer/internal/common" "github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/distro"
"github.com/osbuild/osbuild-composer/internal/kojiapi/api"
"github.com/osbuild/osbuild-composer/internal/rpmmd" "github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/target" "github.com/osbuild/osbuild-composer/internal/target"
"github.com/osbuild/osbuild-composer/internal/upload/koji" "github.com/osbuild/osbuild-composer/internal/upload/koji"
@ -43,7 +42,7 @@ func NewServer(workers *worker.Server, rpmMetadata rpmmd.RPMMD, distros *distro.
// Serve serves the koji API over the provided listener socket // Serve serves the koji API over the provided listener socket
func (server *Server) Serve(listener net.Listener) error { func (server *Server) Serve(listener net.Listener) error {
s := http.Server{Handler: Handler(server)} s := http.Server{Handler: api.Handler(server)}
err := s.Serve(listener) err := s.Serve(listener)
if err != nil && err != http.ErrServerClosed { if err != nil && err != http.ErrServerClosed {
@ -61,7 +60,7 @@ func (server *Server) PostCompose(w http.ResponseWriter, r *http.Request) {
return return
} }
var request ComposeRequest var request api.ComposeRequest
err := json.NewDecoder(r.Body).Decode(&request) err := json.NewDecoder(r.Body).Decode(&request)
if err != nil { if err != nil {
http.Error(w, "Could not parse JSON body", http.StatusBadRequest) http.Error(w, "Could not parse JSON body", http.StatusBadRequest)
@ -189,7 +188,7 @@ func (server *Server) PostCompose(w http.ResponseWriter, r *http.Request) {
panic(err) panic(err)
} }
var response ComposeResponse var response api.ComposeResponse
response.Id = id.String() response.Id = id.String()
response.KojiBuildId = buildInfo.BuildID response.KojiBuildId = buildInfo.BuildID
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")
@ -244,9 +243,9 @@ func (server *Server) GetComposeId(w http.ResponseWriter, r *http.Request, id st
return return
} }
response := ComposeStatus{ response := api.ComposeStatus{
Status: composeStateToStatus(status.State), Status: composeStateToStatus(status.State),
ImageStatuses: []ImageStatus{ ImageStatuses: []api.ImageStatus{
{ {
Status: composeStateToImageStatus(status.State), Status: composeStateToImageStatus(status.State),
}, },