Skip to content

Commit 6f5022a

Browse files
committed
Fix go imports and verifications
Signed-off-by: Juan Antonio Osorio Robles <[email protected]>
1 parent 97f35c5 commit 6f5022a

File tree

9 files changed

+20
-12
lines changed

9 files changed

+20
-12
lines changed

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ linters:
7171
# - wsl
7272
linters-settings:
7373
gci:
74-
local-prefixes: sigs.k8s.io/security-profiles-operator
74+
local-prefixes: containers/selinuxd
7575
errcheck:
7676
check-type-assertions: true
7777
check-blank: true

cmd/daemon.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ import (
2121
"os/signal"
2222
"syscall"
2323

24+
"github.com/spf13/cobra"
25+
2426
"github.com/containers/selinuxd/pkg/daemon"
2527
"github.com/containers/selinuxd/pkg/datastore"
2628
"github.com/containers/selinuxd/pkg/semodule/semanage"
27-
"github.com/spf13/cobra"
2829
)
2930

3031
// daemonCmd represents the daemon command

cmd/is-ready.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ import (
2323
"os"
2424
"syscall"
2525

26-
"github.com/containers/selinuxd/pkg/daemon"
2726
"github.com/spf13/cobra"
27+
28+
"github.com/containers/selinuxd/pkg/daemon"
2829
)
2930

3031
// isreadyCmd represents the is-ready command

cmd/oneshot.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ import (
2020
"os"
2121
"syscall"
2222

23+
"github.com/go-logr/logr"
24+
"github.com/spf13/cobra"
25+
2326
"github.com/containers/selinuxd/pkg/daemon"
2427
"github.com/containers/selinuxd/pkg/datastore"
2528
"github.com/containers/selinuxd/pkg/semodule"
2629
"github.com/containers/selinuxd/pkg/semodule/semanage"
27-
"github.com/go-logr/logr"
28-
"github.com/spf13/cobra"
2930
)
3031

3132
// oneshotCmd represents the oneshot command

cmd/status.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ import (
2626
"strings"
2727
"syscall"
2828

29-
"github.com/containers/selinuxd/pkg/daemon"
3029
"github.com/olekukonko/tablewriter"
3130
"github.com/spf13/cobra"
31+
32+
"github.com/containers/selinuxd/pkg/daemon"
3233
)
3334

3435
// statusCmd represents the status command

pkg/daemon/daemon.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import (
44
"os"
55
"path/filepath"
66

7-
"github.com/containers/selinuxd/pkg/datastore"
8-
"github.com/containers/selinuxd/pkg/semodule"
97
"github.com/fsnotify/fsnotify"
108
"github.com/go-logr/logr"
9+
10+
"github.com/containers/selinuxd/pkg/datastore"
11+
"github.com/containers/selinuxd/pkg/semodule"
1112
)
1213

1314
type SelinuxdOptions struct {

pkg/daemon/daemon_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ import (
1313
"testing"
1414
"time"
1515

16-
"github.com/containers/selinuxd/pkg/datastore"
17-
"github.com/containers/selinuxd/pkg/semodule/test"
1816
backoff "github.com/cenkalti/backoff/v4"
1917
"github.com/go-logr/zapr"
2018
"go.uber.org/zap"
19+
20+
"github.com/containers/selinuxd/pkg/datastore"
21+
"github.com/containers/selinuxd/pkg/semodule/test"
2122
)
2223

2324
const (

pkg/daemon/status_server.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ import (
99
"net/http/pprof"
1010
"os"
1111

12-
"github.com/containers/selinuxd/pkg/datastore"
1312
"github.com/go-logr/logr"
1413
"github.com/gorilla/mux"
14+
15+
"github.com/containers/selinuxd/pkg/datastore"
1516
)
1617

1718
const (

tests/e2e/e2e_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/containers/selinuxd/pkg/datastore"
98
. "github.com/onsi/ginkgo"
109
. "github.com/onsi/gomega"
10+
11+
"github.com/containers/selinuxd/pkg/datastore"
1112
)
1213

1314
var _ = Describe("E2e", func() {

0 commit comments

Comments
 (0)