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

rcm: drop sub-package

Browse source 
The osbuild-composer-rcm package was never finished, not in use and will be replaced by osbulid-composer-koji.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-07-17 14:20:15 +01:00
parent 79d27ded25
commit fbfa191c81
14 changed files with 5 additions and 741 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cmd/osbuild-composer/main.go
View file

@ -13,7 +13,6 @@ import (
"github.com/osbuild/osbuild-composer/internal/distro/fedora32"
"github.com/osbuild/osbuild-composer/internal/distro/rhel8"
"github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue"
"github.com/osbuild/osbuild-composer/internal/rcm"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/distro"
@ -143,22 +142,6 @@ func main() {
common.PanicOnError(err)
}()
// Optionally run RCM API as well as Weldr API
if rcmApiListeners, exists := listeners["osbuild-rcm.socket"]; exists {
if len(rcmApiListeners) != 1 {
// Use Fatal to call os.Exit with non-zero return value
log.Fatal("The RCM API socket unit is misconfigured. It should contain only one socket.")
}
rcmListener := rcmApiListeners[0]
rcmAPI := rcm.New(logger, workers, rpm, distros)
go func() {
err := rcmAPI.Serve(rcmListener)
// If the RCM API fails, take down the whole process, not just a single gorutine
log.Fatal("RCM API failed: ", err)
}()
}
if remoteWorkerListeners, exists := listeners["osbuild-remote-worker.socket"]; exists {
for _, listener := range remoteWorkerListeners {
log.Printf("Starting remote listener\n")

69
cmd/osbuild-rcm-tests/main_test.go
View file

@ -1,69 +0,0 @@
// osbuild-rcm-tests run tests against running osbuild-composer instance that was spawned using the
// osbuild-rcm.socket unit. It defines the expected use cases of the RCM API.
// +build integration
package main
import (
"encoding/json"
"net/http"
"strings"
"testing"
"github.com/google/uuid"
"github.com/stretchr/testify/require"
)
func TestRCM(t *testing.T) {
// This is the first request the user sends to osbuild.
submitBody := `
{
"image_builds":
[
{
"distribution": "fedora-31",
"architecture": "x86_64",
"image_type": "qcow2",
"repositories":
[
{
"baseurl": "http://download.fedoraproject.org/pub/fedora/linux/releases/31/Everything/x86_64/os/"
}
]
}
]
}
`
// This is what the user gets back.
var submitResponse struct {
UUID uuid.UUID `json:"compose_id"`
}
// Then it is possible to get the status on the /v1/compose/<UUID> endpoint.
// And finally this is the response from getting the status.
var statusResponse struct {
Status string `json:"status"`
}
// osbuild instance running on localhost
socket := "http://127.0.0.1:80/"
endpoint := "v1/compose"
// Case 1: POST request
resp, err := http.Post(socket+endpoint, "application/json", strings.NewReader(submitBody))
require.Nilf(t, err, "Failed to submit a compose: %v", err)
require.Equalf(t, resp.StatusCode, 200, "Error: the %v returned non 200 status. Full response: %v", endpoint, resp)
err = json.NewDecoder(resp.Body).Decode(&submitResponse)
require.Nilf(t, err, "Failed to decode JSON response from %v", endpoint)
// Case 2: GET status
statusEndpoint := endpoint + "/" + submitResponse.UUID.String()
resp, err = http.Get(socket + statusEndpoint)
require.Nilf(t, err, "Failed to get a status: %v", err)
require.Equalf(t, resp.StatusCode, 200, "Error: the %v returned non 200 status. Full response: %v", endpoint, resp)
err = json.NewDecoder(resp.Body).Decode(&statusResponse)
require.Nilf(t, err, "Failed to decode JSON response from %v", endpoint)
}