Move ui_backend to pkg/uibackend (#492)

This is the fifth commit in the chain for reorganising under a common
cmd and pkg directory structure. This commit moves ui_backend
package into pkg/uibackend. The underscore is dropped because golang
package names shouldn't have underscores in them.

.licensei.toml

@@ -14,7 +14,7 @@ ignored = [
 ]
 
 [header]
-ignorePaths = ["api","ui_backend/api"]
+ignorePaths = ["api","pkg/uibackend/api"]
 ignoreFiles = ["*mock_*.go","*.pb.go"]
 template = """// Copyright © :YEAR: Cisco Systems, Inc. and its affiliates.
 // All rights reserved.
@@ -29,4 +29,4 @@ template = """// Copyright © :YEAR: Cisco Systems, Inc. and its affiliates.
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
-// limitations under the License."""
+// limitations under the License."""

Makefile

@@ -153,4 +153,4 @@ api-backend: ## Generating API for backend code
 .PHONY: api-ui
 api-ui: ## Generating API for UI backend code
 	@(echo "Generating API for UI backend code ..." )
-	@(cd ui_backend/api; go generate)
+	@(cd pkg/uibackend/api; go generate)

pkg/backend/backend.go

@@ -33,7 +33,7 @@ import (
 	"github.com/openclarity/vmclarity/pkg/orchestrator"
 	"github.com/openclarity/vmclarity/pkg/shared/backendclient"
 	"github.com/openclarity/vmclarity/pkg/shared/log"
-	uibackend "github.com/openclarity/vmclarity/ui_backend/pkg/rest"
+	uibackend "github.com/openclarity/vmclarity/pkg/uibackend/rest"
 )
 
 func createDatabaseConfig(config *_config.Config) databaseTypes.DBConfig {

pkg/backend/rest/server.go

@@ -28,8 +28,8 @@ import (
 	"github.com/openclarity/vmclarity/pkg/backend/common"
 	databaseTypes "github.com/openclarity/vmclarity/pkg/backend/database/types"
 	"github.com/openclarity/vmclarity/pkg/shared/log"
-	uiserver "github.com/openclarity/vmclarity/ui_backend/api/server"
-	uirest "github.com/openclarity/vmclarity/ui_backend/pkg/rest"
+	uiserver "github.com/openclarity/vmclarity/pkg/uibackend/api/server"
+	uirest "github.com/openclarity/vmclarity/pkg/uibackend/rest"
 )
 
 const (

ui_backend/api/client/client.cfg.yaml → pkg/uibackend/api/client/client.cfg.yaml

@@ -1,9 +1,9 @@
 package: client
 output: client/client.gen.go
 additional-imports:
-  - package: github.com/openclarity/vmclarity/ui_backend/api/models
+  - package: github.com/openclarity/vmclarity/pkg/uibackend/api/models
     alias: .
 generate:
   client: true
 output-options:
-  skip-prune: true
+  skip-prune: true

ui_backend/api/server/server.cfg.yaml → pkg/uibackend/api/server/server.cfg.yaml

@@ -1,7 +1,7 @@
 package: server
 output: server/server.gen.go
 additional-imports:
-  - package: github.com/openclarity/vmclarity/ui_backend/api/models
+  - package: github.com/openclarity/vmclarity/pkg/uibackend/api/models
     alias: .
 generate:
   echo-server: true

ui_backend/pkg/rest/common.go → pkg/uibackend/rest/common.go

@@ -19,7 +19,7 @@ import (
 	"github.com/labstack/echo/v4"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/openclarity/vmclarity/ui_backend/api/models"
+	"github.com/openclarity/vmclarity/pkg/uibackend/api/models"
 )
 
 // nolint:wrapcheck,unparam

ui_backend/pkg/rest/dashboard_findings_impact.go → pkg/uibackend/rest/dashboard_findings_impact.go

@@ -28,7 +28,7 @@ import (
 	backendmodels "github.com/openclarity/vmclarity/api/models"
 	"github.com/openclarity/vmclarity/pkg/shared/findingkey"
 	"github.com/openclarity/vmclarity/pkg/shared/utils"
-	"github.com/openclarity/vmclarity/ui_backend/api/models"
+	"github.com/openclarity/vmclarity/pkg/uibackend/api/models"
 )
 
 const (

ui_backend/pkg/rest/dashboard_findings_impact_test.go → pkg/uibackend/rest/dashboard_findings_impact_test.go

@@ -26,7 +26,7 @@ import (
 	backendmodels "github.com/openclarity/vmclarity/api/models"
 	"github.com/openclarity/vmclarity/pkg/shared/findingkey"
 	"github.com/openclarity/vmclarity/pkg/shared/utils"
-	"github.com/openclarity/vmclarity/ui_backend/api/models"
+	"github.com/openclarity/vmclarity/pkg/uibackend/api/models"
 )
 
 func Test_processFindings(t *testing.T) {

ui_backend/pkg/rest/dashboard_findings_trends.go → pkg/uibackend/rest/dashboard_findings_trends.go

@@ -27,7 +27,7 @@ import (
 
 	backendmodels "github.com/openclarity/vmclarity/api/models"
 	"github.com/openclarity/vmclarity/pkg/shared/utils"
-	"github.com/openclarity/vmclarity/ui_backend/api/models"
+	"github.com/openclarity/vmclarity/pkg/uibackend/api/models"
 )
 
 const (

ui_backend/pkg/rest/dashboard_findings_trends_test.go → pkg/uibackend/rest/dashboard_findings_trends_test.go

@@ -22,7 +22,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"gotest.tools/v3/assert"
 
-	"github.com/openclarity/vmclarity/ui_backend/api/models"
+	"github.com/openclarity/vmclarity/pkg/uibackend/api/models"
 )
 
 func Test_createTimes(t *testing.T) {

ui_backend/pkg/rest/dashboard_riskiest_assets.go → pkg/uibackend/rest/dashboard_riskiest_assets.go

@@ -26,7 +26,7 @@ import (
 
 	backendmodels "github.com/openclarity/vmclarity/api/models"
 	"github.com/openclarity/vmclarity/pkg/shared/utils"
-	"github.com/openclarity/vmclarity/ui_backend/api/models"
+	"github.com/openclarity/vmclarity/pkg/uibackend/api/models"
 )
 
 const (

ui_backend/pkg/rest/dashboard_riskiest_assets_test.go → pkg/uibackend/rest/dashboard_riskiest_assets_test.go

@@ -25,7 +25,7 @@ import (
 
 	backendmodels "github.com/openclarity/vmclarity/api/models"
 	"github.com/openclarity/vmclarity/pkg/shared/utils"
-	"github.com/openclarity/vmclarity/ui_backend/api/models"
+	"github.com/openclarity/vmclarity/pkg/uibackend/api/models"
 )
 
 func Test_getTotalFindingField(t *testing.T) {

ui_backend/pkg/rest/dashboard_riskiest_regions.go → pkg/uibackend/rest/dashboard_riskiest_regions.go

@@ -25,7 +25,7 @@ import (
 
 	backendmodels "github.com/openclarity/vmclarity/api/models"
 	"github.com/openclarity/vmclarity/pkg/shared/utils"
-	"github.com/openclarity/vmclarity/ui_backend/api/models"
+	"github.com/openclarity/vmclarity/pkg/uibackend/api/models"
 )
 
 func (s *ServerImpl) GetDashboardRiskiestRegions(ctx echo.Context) error {

ui_backend/pkg/rest/dashboard_riskiest_regions_test.go → pkg/uibackend/rest/dashboard_riskiest_regions_test.go

@@ -26,7 +26,7 @@ import (
 
 	backendmodels "github.com/openclarity/vmclarity/api/models"
 	"github.com/openclarity/vmclarity/pkg/shared/utils"
-	"github.com/openclarity/vmclarity/ui_backend/api/models"
+	"github.com/openclarity/vmclarity/pkg/uibackend/api/models"
 )
 
 func Test_getAssetLocation(t *testing.T) {