refactor audit

Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2022-04-13 12:00:51 +02:00
parent fdd94daae8
commit 725d55b494
22 changed files with 26 additions and 26 deletions

View File

@@ -1,27 +1,27 @@
SHELL := bash
NAME := audit
include ../.make/recursion.mk
include ../../.make/recursion.mk
############ tooling ############
ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
include ../.bingo/Variables.mk
include ../../.bingo/Variables.mk
endif
############ go tooling ############
include ../.make/go.mk
include ../../.make/go.mk
############ release ############
include ../.make/release.mk
include ../../.make/release.mk
############ docs generate ############
include ../.make/docs.mk
include ../../.make/docs.mk
.PHONY: docs-generate
docs-generate: config-docs-generate
############ generate ############
include ../.make/generate.mk
include ../../.make/generate.mk
.PHONY: ci-go-generate
ci-go-generate: # CI runs ci-node-generate automatically before this target

View File

@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/audit/pkg/command"
"github.com/owncloud/ocis/audit/pkg/config/defaults"
"github.com/owncloud/ocis/extensions/audit/pkg/command"
"github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
)
func main() {

View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/owncloud/ocis/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/urfave/cli/v2"
)

View File

@@ -4,7 +4,7 @@ import (
"context"
"os"
"github.com/owncloud/ocis/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/thejerf/suture/v4"

View File

@@ -7,11 +7,11 @@ import (
"github.com/asim/go-micro/plugins/events/natsjs/v4"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/events/server"
"github.com/owncloud/ocis/audit/pkg/config"
"github.com/owncloud/ocis/audit/pkg/config/parser"
"github.com/owncloud/ocis/audit/pkg/logging"
svc "github.com/owncloud/ocis/audit/pkg/service"
"github.com/owncloud/ocis/audit/pkg/types"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/config/parser"
"github.com/owncloud/ocis/extensions/audit/pkg/logging"
svc "github.com/owncloud/ocis/extensions/audit/pkg/service"
"github.com/owncloud/ocis/extensions/audit/pkg/types"
"github.com/urfave/cli/v2"
)

View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/owncloud/ocis/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/urfave/cli/v2"
)

View File

@@ -1,7 +1,7 @@
package defaults
import (
"github.com/owncloud/ocis/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
)
func FullDefaultConfig() *config.Config {

View File

@@ -3,8 +3,8 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/audit/pkg/config"
"github.com/owncloud/ocis/audit/pkg/config/defaults"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"

View File

@@ -1,7 +1,7 @@
package logging
import (
"github.com/owncloud/ocis/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)

View File

@@ -7,8 +7,8 @@ import (
"os"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/owncloud/ocis/audit/pkg/config"
"github.com/owncloud/ocis/audit/pkg/types"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/types"
"github.com/owncloud/ocis/ocis-pkg/log"
)

View File

@@ -6,7 +6,7 @@ import (
"testing"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/owncloud/ocis/audit/pkg/types"
"github.com/owncloud/ocis/extensions/audit/pkg/types"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/test-go/testify/require"

View File

@@ -3,8 +3,8 @@ package config
import (
"github.com/owncloud/ocis/ocis-pkg/shared"
audit "github.com/owncloud/ocis/audit/pkg/config"
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config"
audit "github.com/owncloud/ocis/extensions/audit/pkg/config"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config"
graph "github.com/owncloud/ocis/extensions/graph/pkg/config"

View File

@@ -1,8 +1,8 @@
package config
import (
audit "github.com/owncloud/ocis/audit/pkg/config/defaults"
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults"
graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"

View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/owncloud/ocis/audit/pkg/command"
"github.com/owncloud/ocis/extensions/audit/pkg/command"
"github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/parser"
"github.com/owncloud/ocis/ocis/pkg/register"