Merge branch 'main' into api-test-assessment

.github/workflows/main.yml

@@ -58,6 +58,7 @@ jobs:
           DISCONNECTED=1 make run &
           sleep 15  # probably a dirty solution
           HUB_BASE_URL=http://localhost:8080 make test-api
+          HUB_BASE_URL=http://localhost:8080 make test-api  # Intentionaly run 2x to catch data left in Hub DB.
 
   test-e2e:
     runs-on: ubuntu-latest
@@ -93,3 +94,4 @@ jobs:
     uses: konveyor/ci/.github/workflows/global-ci.yml@main
     with:
       component_name: tackle2-hub
+      api_hub_tests_ref: refs/pull/${{ github.ref_name }}

.github/workflows/test-nightly.yml

@@ -26,3 +26,4 @@ jobs:
           DISCONNECTED=1 make run &
           sleep 15  # probably a dirty solution
           HUB_BASE_URL=http://localhost:8080 make test-api
+          HUB_BASE_URL=http://localhost:8080 make test-api  # Intentionaly run 2x to catch data left in Hub DB.

Dockerfile

@@ -1,16 +1,23 @@
+ARG SEED_ROOT=/opt/app-root/src/tackle2-seed
 FROM registry.access.redhat.com/ubi9/go-toolset:latest as builder
 ENV GOPATH=$APP_ROOT
 COPY --chown=1001:0 . .
 RUN make docker
-RUN git clone https://github.com/konveyor/tackle2-seed
+ARG SEED_PROJECT=konveyor/tackle2-seed
+ARG SEED_BRANCH=main
+ARG SEED_ROOT
+RUN if [ ! -d "${SEED_ROOT}" ]; then \
+      git clone --branch ${SEED_BRANCH} https://github.com/${SEED_PROJECT} ${SEED_ROOT}; \
+    fi
 
 FROM quay.io/konveyor/static-report as report
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
+ARG SEED_ROOT
 COPY --from=builder /opt/app-root/src/bin/hub /usr/local/bin/tackle-hub
 COPY --from=builder /opt/app-root/src/auth/roles.yaml /tmp/roles.yaml
 COPY --from=builder /opt/app-root/src/auth/users.yaml /tmp/users.yaml
-COPY --from=builder /opt/app-root/src/tackle2-seed/resources/ /tmp/seed
+COPY --from=builder ${SEED_ROOT}/resources/ /tmp/seed
 COPY --from=report /usr/local/static-report /tmp/analysis/report
 
 RUN microdnf -y install \

Makefile

@@ -82,15 +82,19 @@ controller-gen:
 addon: fmt vet
 	go build -o bin/addon github.com/konveyor/tackle2-hub/hack/cmd/addon
 
-docs: docs-swagger docs-binding
+docs: docs-html docs-openapi3 docs-binding
 
 # Build Swagger API spec into ./docs directory
 docs-swagger:
-	${GOBIN}/swag init -g api/base.go
+	${GOBIN}/swag init -g pkg.go --dir api,assessment
+
+# Build OpenAPI 3.0 docs
+docs-openapi3: docs-swagger
+	curl -X POST -H "Content-Type: application/json" -d @docs/swagger.json https://converter.swagger.io/api/convert | jq > docs/openapi3.json
 
 # Build HTML docs from Swagger API spec
-docs-html: docs-swagger
-	redoc-cli bundle -o docs/index.html docs/swagger.json
+docs-html: docs-openapi3
+	redoc-cli bundle -o docs/index.html docs/openapi3.json
 
 # Build binding doc.
 docs-binding:
@@ -131,7 +135,7 @@ test:
 
 # Run Hub REST API tests.
 test-api:
-	HUB_BASE_URL=${HUB_BASE_URL} go test -count=1 -v ./test/api/...
+	HUB_BASE_URL=${HUB_BASE_URL} go test -count=1 -p=1 -v ./test/api/...
 
 # Run Hub test suite.
 test-all: test-unit test-api

addon/adapter.go

@@ -5,6 +5,7 @@ Tackle hub/addon integration.
 package addon
 
 import (
+	logapi "github.com/go-logr/logr"
 	"github.com/jortel/go-utils/logr"
 	"github.com/konveyor/tackle2-hub/binding"
 	"github.com/konveyor/tackle2-hub/settings"
@@ -67,6 +68,8 @@ type Filter = binding.Filter
 type Adapter struct {
 	// Task API.
 	Task
+	// Log API.
+	Log logapi.Logger
 	// Settings API.
 	Setting Setting
 	// Application API.
@@ -141,6 +144,7 @@ func newAdapter() (adapter *Adapter) {
 		Task: Task{
 			richClient: richClient,
 		},
+		Log:         Log,
 		Setting:     richClient.Setting,
 		Application: richClient.Application,
 		Identity:    richClient.Identity,

api/adoptionplan.go

@@ -37,14 +37,14 @@ func (h AdoptionPlanHandler) AddRoutes(e *gin.Engine) {
 	routeGroup.POST(AdoptionPlansRoot, h.Graph)
 }
 
-// Get godoc
+// Graph godoc
 // @summary Generate an application dependency graph arranged in topological order.
 // @description Graph generates an application dependency graph arranged in topological order.
 // @tags adoptionplans
 // @produce json
-// @success 200 {object} api.DependencyGraph
+// @success 200 {object} []api.Vertex
 // @router /adoptionplans [post]
-// @param requestedApps path array true "requested App IDs"
+// @param requestedApps body []uint true "List of requested App IDs"
 func (h AdoptionPlanHandler) Graph(ctx *gin.Context) {
 	var requestedApps []struct {
 		ApplicationID uint `json:"applicationId"`
@@ -113,13 +113,13 @@ func (h AdoptionPlanHandler) Graph(ctx *gin.Context) {
 //
 // Vertex represents a vertex in the dependency graph.
 type Vertex struct {
-	ID             uint   `json:"applicationId"`
-	Name           string `json:"applicationName"`
+	ID             uint   `json:"applicationId" yaml:"applicationId"`
+	Name           string `json:"applicationName" yaml:"applicationName"`
 	Decision       string `json:"decision"`
-	EffortEstimate string `json:"effortEstimate"`
+	EffortEstimate string `json:"effortEstimate" yaml:"effortEstimate"`
 	Effort         int    `json:"effort"`
-	PositionY      int    `json:"positionY"`
-	PositionX      int    `json:"positionX"`
+	PositionY      int    `json:"positionY" yaml:"positionY"`
+	PositionX      int    `json:"positionX" yaml:"positionX"`
 }
 
 //