mirror of
https://github.com/redhat-developer/odo.git
synced 2025-10-19 03:06:19 +03:00
Implement API endpoints (#6915)
* Pass odo context to api server * Get /instance * DELETE /instance implementation * Move describe logic to pkg/component/describe * Get /component implementation * POST /component/command implementation * Fix example by replacing action with name * Fix integration test * Integration tests * Add comment for PushWatcher * Test DELETE /instance without --no-watch * Apply suggestions from code review Co-authored-by: Armel Soro <armel@rm3l.org> * Return an error if not ready for push * Fix windows tests * Fix tests for Windows --------- Co-authored-by: Armel Soro <armel@rm3l.org>
This commit is contained in:
Philippe Martin
@@ -1,12 +1,18 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
"github.com/redhat-developer/odo/tests/helper"
|
||||
"io"
|
||||
"net/http"
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
"github.com/redhat-developer/odo/pkg/labels"
|
||||
"github.com/redhat-developer/odo/tests/helper"
|
||||
"k8s.io/utils/pointer"
|
||||
)
|
||||
|
||||
var _ = Describe("odo dev command with api server tests", func() {
|
||||
@@ -63,11 +69,157 @@ var _ = Describe("odo dev command with api server tests", func() {
|
||||
url := fmt.Sprintf("http://%s/instance", devSession.APIServerEndpoint)
|
||||
resp, err := http.Get(url)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
// TODO: Change this once it is implemented
|
||||
Expect(resp.StatusCode).To(BeEquivalentTo(http.StatusNotImplemented))
|
||||
Expect(resp.StatusCode).To(BeEquivalentTo(http.StatusOK))
|
||||
})
|
||||
})
|
||||
}))
|
||||
}
|
||||
|
||||
When("the component is bootstrapped", helper.LabelPodmanIf(podman, func() {
|
||||
BeforeEach(func() {
|
||||
helper.CopyExample(filepath.Join("source", "devfiles", "nodejs", "project"), commonVar.Context)
|
||||
helper.CopyExampleDevFile(filepath.Join("source", "devfiles", "nodejs", "devfile.yaml"), filepath.Join(commonVar.Context, "devfile.yaml"), cmpName)
|
||||
})
|
||||
When("odo dev is run with --api-server flag", func() {
|
||||
var (
|
||||
devSession helper.DevSession
|
||||
)
|
||||
BeforeEach(func() {
|
||||
opts := helper.DevSessionOpts{
|
||||
RunOnPodman: podman,
|
||||
StartAPIServer: true,
|
||||
EnvVars: []string{"ODO_EXPERIMENTAL_MODE=true"},
|
||||
}
|
||||
var err error
|
||||
devSession, err = helper.StartDevMode(opts)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
})
|
||||
AfterEach(func() {
|
||||
devSession.Stop()
|
||||
devSession.WaitEnd()
|
||||
})
|
||||
It("should serve endpoints", func() {
|
||||
By("GETting /instance", func() {
|
||||
url := fmt.Sprintf("http://%s/instance", devSession.APIServerEndpoint)
|
||||
resp, err := http.Get(url)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(resp.StatusCode).To(BeEquivalentTo(http.StatusOK))
|
||||
defer resp.Body.Close()
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
strBody := string(body)
|
||||
helper.JsonPathExist(strBody, "pid")
|
||||
helper.JsonPathContentIs(strBody, "componentDirectory", commonVar.Context)
|
||||
})
|
||||
By("GETting /component", func() {
|
||||
url := fmt.Sprintf("http://%s/component", devSession.APIServerEndpoint)
|
||||
resp, err := http.Get(url)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(resp.StatusCode).To(BeEquivalentTo(http.StatusOK))
|
||||
defer resp.Body.Close()
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
strBody := string(body)
|
||||
helper.JsonPathContentIs(strBody, "devfilePath", filepath.Join(commonVar.Context, "devfile.yaml"))
|
||||
helper.JsonPathContentIs(strBody, "devfileData.devfile.metadata.name", cmpName)
|
||||
helper.JsonPathContentIs(strBody, "devfileData.supportedOdoFeatures.dev", "true")
|
||||
helper.JsonPathContentIs(strBody, "devfileData.supportedOdoFeatures.deploy", "false")
|
||||
helper.JsonPathContentIs(strBody, "devfileData.supportedOdoFeatures.debug", "false")
|
||||
helper.JsonPathContentIs(strBody, "managedBy", "odo")
|
||||
if podman {
|
||||
helper.JsonPathDoesNotExist(strBody, "runningOn.cluster")
|
||||
helper.JsonPathExist(strBody, "runningOn.podman")
|
||||
helper.JsonPathContentIs(strBody, "runningOn.podman.dev", "true")
|
||||
helper.JsonPathContentIs(strBody, "runningOn.podman.deploy", "false")
|
||||
} else {
|
||||
helper.JsonPathDoesNotExist(strBody, "runningOn.podman")
|
||||
helper.JsonPathExist(strBody, "runningOn.cluster")
|
||||
helper.JsonPathContentIs(strBody, "runningOn.cluster.dev", "true")
|
||||
helper.JsonPathContentIs(strBody, "runningOn.cluster.deploy", "false")
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
When("/component/command endpoint is POSTed", func() {
|
||||
BeforeEach(func() {
|
||||
url := fmt.Sprintf("http://%s/component/command", devSession.APIServerEndpoint)
|
||||
resp, err := http.Post(url, "application/json", bytes.NewBuffer([]byte(`{"name": "push"}`)))
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(resp.StatusCode).To(BeEquivalentTo(http.StatusOK))
|
||||
})
|
||||
|
||||
It("should trigger a push", func() {
|
||||
err := devSession.WaitSync()
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
})
|
||||
})
|
||||
|
||||
When("/instance endpoint is DELETEd", func() {
|
||||
|
||||
BeforeEach(func() {
|
||||
url := fmt.Sprintf("http://%s/instance", devSession.APIServerEndpoint)
|
||||
req, err := http.NewRequest(http.MethodDelete, url, bytes.NewBuffer([]byte{}))
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
client := &http.Client{}
|
||||
resp, err := client.Do(req)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(resp.StatusCode).To(BeEquivalentTo(http.StatusOK))
|
||||
})
|
||||
|
||||
It("should terminate the dev session", func() {
|
||||
devSession.WaitEnd()
|
||||
fmt.Println("<<< Session terminated >>>")
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
When("odo is executed with --no-watch and --api-server flags", helper.LabelPodmanIf(podman, func() {
|
||||
|
||||
var devSession helper.DevSession
|
||||
|
||||
BeforeEach(func() {
|
||||
var err error
|
||||
args := []string{"--no-watch"}
|
||||
devSession, err = helper.StartDevMode(helper.DevSessionOpts{
|
||||
CmdlineArgs: args,
|
||||
RunOnPodman: podman,
|
||||
StartAPIServer: true,
|
||||
EnvVars: []string{"ODO_EXPERIMENTAL_MODE=true"},
|
||||
})
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
})
|
||||
|
||||
AfterEach(func() {
|
||||
devSession.Stop()
|
||||
devSession.WaitEnd()
|
||||
})
|
||||
|
||||
When("a file in component directory is modified", func() {
|
||||
|
||||
BeforeEach(func() {
|
||||
helper.ReplaceString(filepath.Join(commonVar.Context, "server.js"), "App started", "App is super started")
|
||||
devSession.CheckNotSynced(10 * time.Second)
|
||||
})
|
||||
|
||||
When("/component/command endpoint is POSTed", func() {
|
||||
|
||||
BeforeEach(func() {
|
||||
url := fmt.Sprintf("http://%s/component/command", devSession.APIServerEndpoint)
|
||||
resp, err := http.Post(url, "application/json", bytes.NewBuffer([]byte(`{"name": "push"}`)))
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(resp.StatusCode).To(BeEquivalentTo(http.StatusOK))
|
||||
})
|
||||
|
||||
It("should trigger a push", func() {
|
||||
err := devSession.WaitSync()
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
component := helper.NewComponent(cmpName, "app", labels.ComponentDevMode, commonVar.Project, commonVar.CliRunner)
|
||||
execResult, _ := component.Exec("runtime", []string{"cat", "/projects/server.js"}, pointer.Bool(true))
|
||||
Expect(execResult).To(ContainSubstring("App is super started"))
|
||||
})
|
||||
})
|
||||
})
|
||||
}))
|
||||
}))
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user