Skip to content

Commit 558f3eb

Browse files
committed
Tidying imports
Signed-off-by: German Maglione <[email protected]>
1 parent ad5a29f commit 558f3eb

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

cmd/rm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package cmd
33
import (
44
"fmt"
55
"os"
6+
67
"podman-bootc/pkg/config"
78
"podman-bootc/pkg/user"
89
"podman-bootc/pkg/vm"
910

1011
"github.com/sirupsen/logrus"
11-
1212
"github.com/spf13/cobra"
1313
)
1414

pkg/bootc/bootc_disk.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"time"
1313

1414
"podman-bootc/pkg/config"
15-
1615
"podman-bootc/pkg/user"
1716

1817
"github.com/containers/podman/v5/pkg/bindings/containers"

pkg/user/user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import (
55
"os"
66
"os/user"
77
"path/filepath"
8-
"podman-bootc/pkg/config"
98
"strconv"
109

10+
"podman-bootc/pkg/config"
11+
1112
"github.com/adrg/xdg"
1213
"github.com/containers/podman/v5/pkg/rootless"
1314
)
@@ -63,7 +64,6 @@ func (u *User) RunDir() string {
6364
return filepath.Join(xdg.RuntimeDir, config.ProjectName, "run")
6465
}
6566

66-
6767
func (u *User) InitOSCDirs() error {
6868
if err := os.MkdirAll(u.ConfigDir(), os.ModePerm); err != nil {
6969
return err

pkg/utils/podman.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import (
55
"errors"
66
"fmt"
77
"os/exec"
8-
"podman-bootc/pkg/user"
98
"strings"
109

10+
"podman-bootc/pkg/user"
11+
1112
"github.com/containers/podman/v5/pkg/machine"
1213
"github.com/containers/podman/v5/pkg/machine/define"
1314
"github.com/containers/podman/v5/pkg/machine/env"

pkg/vm/vm.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ import (
77
"os"
88
"os/exec"
99
"path/filepath"
10-
"podman-bootc/pkg/bootc"
11-
"podman-bootc/pkg/config"
12-
"podman-bootc/pkg/user"
1310
"strconv"
1411
"strings"
1512
"time"
1613

14+
"podman-bootc/pkg/bootc"
15+
"podman-bootc/pkg/config"
16+
"podman-bootc/pkg/user"
17+
1718
"github.com/docker/go-units"
1819
"github.com/sirupsen/logrus"
1920
"golang.org/x/crypto/ssh"
@@ -71,7 +72,7 @@ type BootcVM interface {
7172
Exists() (bool, error)
7273
GetConfig() (*BootcVMConfig, error)
7374
CloseConnection()
74-
PrintConsole() (error)
75+
PrintConsole() error
7576
}
7677

7778
type BootcVMCommon struct {

pkg/vm/vm_linux.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"errors"
77
"fmt"
88
"path/filepath"
9-
"podman-bootc/pkg/config"
109
"strconv"
1110
"text/template"
1211
"time"
1312

13+
"podman-bootc/pkg/config"
14+
1415
"github.com/sirupsen/logrus"
1516
"libvirt.org/go/libvirt"
1617
)
@@ -19,8 +20,8 @@ import (
1920
var domainTemplate string
2021

2122
type BootcVMLinux struct {
22-
domain *libvirt.Domain
23-
libvirtUri string
23+
domain *libvirt.Domain
24+
libvirtUri string
2425
libvirtConnection *libvirt.Connect
2526
BootcVMCommon
2627
}

pkg/vm/vm_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@ import (
55
"os"
66
osUser "os/user"
77
"path/filepath"
8-
"podman-bootc/cmd"
9-
"podman-bootc/pkg/bootc"
10-
"podman-bootc/pkg/user"
118
"testing"
129
"time"
1310

11+
"podman-bootc/cmd"
12+
"podman-bootc/pkg/bootc"
13+
"podman-bootc/pkg/user"
1414
"podman-bootc/pkg/vm"
1515

16-
"libvirt.org/go/libvirt"
17-
1816
. "github.com/onsi/ginkgo/v2"
1917
. "github.com/onsi/gomega"
18+
"libvirt.org/go/libvirt"
2019
)
2120

2221
func TestPodmanBootc(t *testing.T) {

podman-bootc.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ import (
99

1010
"podman-bootc/cmd"
1111
"podman-bootc/pkg/bootc"
12-
"podman-bootc/pkg/utils"
13-
1412
"podman-bootc/pkg/user"
13+
"podman-bootc/pkg/utils"
1514

1615
"github.com/containers/podman/v5/pkg/bindings"
1716
"github.com/sirupsen/logrus"

0 commit comments

Comments
 (0)