Merge branch 'main' of github.com:l3montree-dev/devguard

l3montree-dev · Nov 15, 2024 · 8d45a0e · 8d45a0e
2 parents 4eb3d1b + 480dd72
commit 8d45a0e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/cmd/devguard-scanner/commands/sca.go b/cmd/devguard-scanner/commands/sca.go
@@ -184,7 +184,7 @@ func isValidPath(path string) (bool, error) {
 func getCurrentVersion(path string) (string, int, error) {
 	// mark the path as safe git directory
 	slog.Debug("marking path as safe", "path", getDirFromPath(path))
-	cmd := exec.Command("git", "config", "--global", "--add", "safe.directory", getDirFromPath(path)) // nolint:all
+	cmd := exec.Command("git", "config", "--global", "--add", "safe.directory", "*") // nolint:all
 	var out bytes.Buffer
 	var errOut bytes.Buffer
 	cmd.Stdout = &out

diff --git a/cmd/devguard/api/api.go b/cmd/devguard/api/api.go
@@ -420,7 +420,9 @@ func Start(db core.DB) {
 	projectRouter.GET("/", projectController.Read)
 
 	projectRouter.PATCH("/", projectController.Update, projectScopedRBAC(accesscontrol.ObjectProject, accesscontrol.ActionUpdate))
+	projectRouter.DELETE("/", projectController.Delete, projectScopedRBAC(accesscontrol.ObjectProject, accesscontrol.ActionDelete))
 
+	projectRouter.POST("/assets/", assetController.Create, projectScopedRBAC(accesscontrol.ObjectAsset, accesscontrol.ActionCreate))
 	projectRouter.POST("/assets/", assetController.Create, projectScopedRBAC(accesscontrol.ObjectAsset, accesscontrol.ActionCreate))
 	projectRouter.GET("/assets/", assetController.Read)
 
@@ -431,6 +433,8 @@ func Start(db core.DB) {
 
 	assetRouter := projectRouter.Group("/assets/:assetSlug", projectScopedRBAC("asset", accesscontrol.ActionRead), assetMiddleware(assetRepository))
 	assetRouter.GET("/", assetController.Read)
+	assetRouter.DELETE("/", assetController.Delete, projectScopedRBAC("asset", accesscontrol.ActionDelete))
+
 	assetRouter.GET("/metrics/", assetController.Metrics)
 	assetRouter.GET("/dependency-graph/", assetController.DependencyGraph)
 	assetRouter.GET("/affected-components/", assetController.AffectedComponents)

diff --git a/internal/core/asset/asset_controller.go b/internal/core/asset/asset_controller.go
@@ -170,6 +170,15 @@ func (a *httpController) Metrics(c core.Context) error {
 	})
 }
 
+func (a *httpController) Delete(c core.Context) error {
+	asset := core.GetAsset(c)
+	err := a.assetRepository.Delete(nil, asset.GetID())
+	if err != nil {
+		return err
+	}
+	return c.NoContent(200)
+}
+
 func (a *httpController) Create(c core.Context) error {
 	var req createRequest
 	if err := c.Bind(&req); err != nil {