lxc/incus
1
0
Fork 0
mirror of https://github.com/lxc/incus.git synced 2026-10-12 02:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite Go import path to v7

Browse Source 
Signed-off-by: Stéphane Graber <[email protected]>
This commit is contained in:
Stéphane Graber
2026-05-02 01:18:25 +02:00
parent 06c2fe0bca
commit 40dd4f151d
825 changed files with 4556 additions and 4556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -40,7 +40,7 @@ See [Getting started](https://linuxcontainers.org/incus/docs/main/tutorial/first
Type | Service | Status
--- | --- | ---
Tests | GitHub | [![Build Status](https://github.com/lxc/incus/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/lxc/incus/actions?query=event%3Apush+branch%3Amain)
Go documentation | Godoc | [![GoDoc](https://godoc.org/github.com/lxc/incus/v6/client?status.svg)](https://godoc.org/github.com/lxc/incus/v6/client)
Go documentation | Godoc | [![GoDoc](https://godoc.org/github.com/lxc/incus/v7/client?status.svg)](https://godoc.org/github.com/lxc/incus/v7/client)
Static analysis | GoReport | [![Go Report Card](https://goreportcard.com/badge/github.com/lxc/incus)](https://goreportcard.com/report/github.com/lxc/incus)
Translations | Weblate | [![Translation status](https://hosted.weblate.org/widget/incus/svg-badge.svg)](https://hosted.weblate.org/projects/incus/)
client/connection.go
+4 -4
View File
@@ -15,10 +15,10 @@ import (
"github.com/gorilla/websocket"
"github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/simplestreams"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/simplestreams"
"github.com/lxc/incus/v7/shared/util"
)
// ConnectionArgs represents a set of common connection properties.
client/events.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"errors"
"sync"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// The EventListener struct is used to interact with an Incus event stream.
client/incus.go
+3 -3
View File
@@ -16,9 +16,9 @@ import (
"github.com/gorilla/websocket"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/tcp"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/tcp"
)
// ProtocolIncus represents an Incus API server.
client/incus_certificates.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// Certificate handling functions
client/incus_cluster.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetCluster returns information about a cluster.
client/incus_events.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/gorilla/websocket"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// Event handling functions
client/incus_images.go
+6 -6
View File
@@ -14,12 +14,12 @@ import (
"strings"
"time"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/cancel"
"github.com/lxc/incus/v6/shared/ioprogress"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v6/shared/units"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/cancel"
"github.com/lxc/incus/v7/shared/ioprogress"
localtls "github.com/lxc/incus/v7/shared/tls"
"github.com/lxc/incus/v7/shared/units"
"github.com/lxc/incus/v7/shared/util"
)
// Image handling functions
client/incus_instances.go
+8 -8
View File
@@ -18,14 +18,14 @@ import (
"github.com/gorilla/websocket"
"github.com/pkg/sftp"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/cancel"
"github.com/lxc/incus/v6/shared/ioprogress"
"github.com/lxc/incus/v6/shared/tcp"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v6/shared/units"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v6/shared/ws"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/cancel"
"github.com/lxc/incus/v7/shared/ioprogress"
"github.com/lxc/incus/v7/shared/tcp"
localtls "github.com/lxc/incus/v7/shared/tls"
"github.com/lxc/incus/v7/shared/units"
"github.com/lxc/incus/v7/shared/util"
"github.com/lxc/incus/v7/shared/ws"
)
// Instance handling functions.
client/incus_metadata.go
+1 -1
View File
@@ -3,7 +3,7 @@ package incus
import (
"errors"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetMetadataConfiguration returns a configuration metadata struct.
client/incus_network_acls.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"net/http"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetNetworkACLNames returns a list of network ACL names.
client/incus_network_address_sets.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetNetworkAddressSetNames returns a list of network address set names.
client/incus_network_allocations.go
+1 -1
View File
@@ -1,7 +1,7 @@
package incus
import (
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetNetworkAllocations returns a list of Network allocations for a specific project.
client/incus_network_forwards.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetNetworkForwardAddresses returns a list of network forward listen addresses.
client/incus_network_integrations.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetNetworkIntegrationNames returns a list of network integration names.
client/incus_network_load_balancers.go
+1 -1
View File
@@ -1,7 +1,7 @@
package incus
import (
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetNetworkLoadBalancerAddresses returns a list of network load balancer listen addresses.
client/incus_network_peers.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetNetworkPeerNames returns a list of network peer names.
client/incus_network_zones.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetNetworkZoneNames returns a list of network zone names.
client/incus_networks.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetNetworkNames returns a list of network names.
client/incus_oidc.go
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"github.com/zitadel/oidc/v3/pkg/oidc"
"golang.org/x/oauth2"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/util"
)
// ErrOIDCExpired is returned when the token is expired and we can't retry the request ourselves.
client/incus_operations.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/gorilla/websocket"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// GetOperationUUIDs returns a list of operation uuids.
client/incus_profiles.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// Profile handling functions
client/incus_projects.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// Project handling functions
client/incus_server.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/gorilla/websocket"
"github.com/lxc/incus/v6/shared/api"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
localtls "github.com/lxc/incus/v7/shared/tls"
"github.com/lxc/incus/v7/shared/util"
)
// Server handling functions
client/incus_storage_buckets.go
+5 -5
View File
@@ -8,11 +8,11 @@ import (
"net/http"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/cancel"
"github.com/lxc/incus/v6/shared/ioprogress"
"github.com/lxc/incus/v6/shared/units"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/cancel"
"github.com/lxc/incus/v7/shared/ioprogress"
"github.com/lxc/incus/v7/shared/units"
"github.com/lxc/incus/v7/shared/util"
)
// GetStoragePoolBucketNames returns a list of storage bucket names.
client/incus_storage_pools.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// Storage pool handling functions
client/incus_storage_volumes.go
+6 -6
View File
@@ -13,12 +13,12 @@ import (
"github.com/pkg/sftp"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/cancel"
"github.com/lxc/incus/v6/shared/ioprogress"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v6/shared/units"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/cancel"
"github.com/lxc/incus/v7/shared/ioprogress"
localtls "github.com/lxc/incus/v7/shared/tls"
"github.com/lxc/incus/v7/shared/units"
"github.com/lxc/incus/v7/shared/util"
)
// Storage volumes handling function
client/incus_warnings.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// Warning handling functions
client/interfaces.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/gorilla/websocket"
"github.com/pkg/sftp"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/cancel"
"github.com/lxc/incus/v6/shared/ioprogress"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/cancel"
"github.com/lxc/incus/v7/shared/ioprogress"
)
// The Operation type represents a currently running operation.
client/oci_images.go
+7 -7
View File
@@ -17,13 +17,13 @@ import (
"strings"
"time"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/ioprogress"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/osarch"
"github.com/lxc/incus/v6/shared/subprocess"
"github.com/lxc/incus/v6/shared/units"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/ioprogress"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/osarch"
"github.com/lxc/incus/v7/shared/subprocess"
"github.com/lxc/incus/v7/shared/units"
"github.com/lxc/incus/v7/shared/util"
)
type ociInfo struct {
client/oci_util_linux.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/opencontainers/umoci/oci/casext"
"github.com/opencontainers/umoci/oci/layer"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v7/shared/logger"
)
func init() {
client/operations.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/gorilla/websocket"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
// The Operation type represents an ongoing Incus operation (asynchronous processing).
client/simplestreams.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"errors"
"net/http"
"github.com/lxc/incus/v6/shared/simplestreams"
"github.com/lxc/incus/v7/shared/simplestreams"
)
// ProtocolSimpleStreams implements a SimpleStreams API client.
client/simplestreams_images.go
+5 -5
View File
@@ -13,11 +13,11 @@ import (
"strings"
"time"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/simplestreams"
"github.com/lxc/incus/v6/shared/subprocess"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/simplestreams"
"github.com/lxc/incus/v7/shared/subprocess"
"github.com/lxc/incus/v7/shared/util"
)
// Image handling functions
client/util.go
+2 -2
View File
@@ -13,8 +13,8 @@ import (
"strings"
"time"
"github.com/lxc/incus/v6/shared/proxy"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v7/shared/proxy"
localtls "github.com/lxc/incus/v7/shared/tls"
)
// tlsHTTPClient creates an HTTP client with a specified Transport Layer Security (TLS) configuration.
cmd/fuidshift/main.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v7/internal/version"
)
type cmdGlobal struct {
cmd/fuidshift/main_shift.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/shared/idmap"
"github.com/lxc/incus/v7/shared/idmap"
)
type cmdShift struct {
cmd/generate-database/db.go
+3 -3
View File
@@ -14,9 +14,9 @@ import (
"github.com/spf13/pflag"
"golang.org/x/tools/go/packages"
"github.com/lxc/incus/v6/cmd/generate-database/db"
"github.com/lxc/incus/v6/cmd/generate-database/file"
"github.com/lxc/incus/v6/cmd/generate-database/lex"
"github.com/lxc/incus/v7/cmd/generate-database/db"
"github.com/lxc/incus/v7/cmd/generate-database/file"
"github.com/lxc/incus/v7/cmd/generate-database/lex"
)
// Return a new db command.
cmd/generate-database/db/lex.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"strings"
"github.com/lxc/incus/v6/cmd/generate-database/lex"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/cmd/generate-database/lex"
"github.com/lxc/incus/v7/shared/util"
)
// Return the table name for the given database entity.
cmd/generate-database/db/mapping.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"slices"
"strings"
"github.com/lxc/incus/v6/cmd/generate-database/lex"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/cmd/generate-database/lex"
"github.com/lxc/incus/v7/shared/util"
)
// Mapping holds information for mapping database tables to a Go structure.
cmd/generate-database/db/method.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"golang.org/x/tools/go/packages"
"github.com/lxc/incus/v6/cmd/generate-database/file"
"github.com/lxc/incus/v6/cmd/generate-database/lex"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/cmd/generate-database/file"
"github.com/lxc/incus/v7/cmd/generate-database/lex"
"github.com/lxc/incus/v7/shared/util"
)
// Method generates a code snippet for a particular database query method.
cmd/generate-database/db/parse.go
+2 -2
View File
@@ -15,8 +15,8 @@ import (
"golang.org/x/tools/go/packages"
"github.com/lxc/incus/v6/cmd/generate-database/lex"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/cmd/generate-database/lex"
"github.com/lxc/incus/v7/shared/util"
)
// FiltersFromStmt parses all filtering statement defined for the given entity. It
cmd/generate-database/db/parse_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/tools/go/packages"
"github.com/lxc/incus/v6/cmd/generate-database/db"
"github.com/lxc/incus/v7/cmd/generate-database/db"
)
type Person struct {
cmd/generate-database/db/schema.go
+2 -2
View File
@@ -3,8 +3,8 @@ package db
import (
"fmt"
"github.com/lxc/incus/v6/internal/server/db/cluster"
"github.com/lxc/incus/v6/internal/server/db/node"
"github.com/lxc/incus/v7/internal/server/db/cluster"
"github.com/lxc/incus/v7/internal/server/db/node"
)
// UpdateSchema updates the schema.go file of the cluster and node databases.
cmd/generate-database/db/stmt.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"golang.org/x/tools/go/packages"
"github.com/lxc/incus/v6/cmd/generate-database/file"
"github.com/lxc/incus/v6/cmd/generate-database/lex"
"github.com/lxc/incus/v7/cmd/generate-database/file"
"github.com/lxc/incus/v7/cmd/generate-database/lex"
)
// Stmt generates a particular database query statement.
cmd/generate-database/file/write.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"os"
"strings"
"github.com/lxc/incus/v6/cmd/generate-database/lex"
"github.com/lxc/incus/v7/cmd/generate-database/lex"
)
const codeGeneratedByLine = `// Code generated by generate-database from the incus project - DO NOT EDIT.`
cmd/incus-agent/api.go
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import (
"net/http"
"github.com/lxc/incus/v6/internal/server/response"
"github.com/lxc/incus/v7/internal/server/response"
)
// APIEndpoint represents a URL in our API.
cmd/incus-agent/api_1.0.go
+8 -8
View File
@@ -9,14 +9,14 @@ import (
"os"
"path/filepath"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/ports"
"github.com/lxc/incus/v6/internal/server/response"
localvsock "github.com/lxc/incus/v6/internal/server/vsock"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/api"
agentAPI "github.com/lxc/incus/v6/shared/api/agent"
localtls "github.com/lxc/incus/v6/shared/tls"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/ports"
"github.com/lxc/incus/v7/internal/server/response"
localvsock "github.com/lxc/incus/v7/internal/server/vsock"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/api"
agentAPI "github.com/lxc/incus/v7/shared/api/agent"
localtls "github.com/lxc/incus/v7/shared/tls"
)
var api10Cmd = APIEndpoint{
cmd/incus-agent/daemon.go
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import (
"sync"
"github.com/lxc/incus/v6/internal/server/events"
"github.com/lxc/incus/v7/internal/server/events"
)
// A Daemon can respond to requests from a shared client.
cmd/incus-agent/dev_incus.go
+7 -7
View File
@@ -9,13 +9,13 @@ import (
"strings"
"time"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/server/daemon"
"github.com/lxc/incus/v6/internal/server/device/config"
localUtil "github.com/lxc/incus/v6/internal/server/util"
api "github.com/lxc/incus/v6/shared/api/guest"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/server/daemon"
"github.com/lxc/incus/v7/internal/server/device/config"
localUtil "github.com/lxc/incus/v7/internal/server/util"
api "github.com/lxc/incus/v7/shared/api/guest"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/util"
)
// DevIncusServer creates an http.Server capable of handling requests against the
cmd/incus-agent/events.go
+5 -5
View File
@@ -7,11 +7,11 @@ import (
"strings"
"time"
"github.com/lxc/incus/v6/internal/server/events"
"github.com/lxc/incus/v6/internal/server/response"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/ws"
"github.com/lxc/incus/v7/internal/server/events"
"github.com/lxc/incus/v7/internal/server/response"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/ws"
)
var eventsCmd = APIEndpoint{
cmd/incus-agent/exec.go
+8 -8
View File
@@ -17,14 +17,14 @@ import (
"github.com/gorilla/websocket"
"github.com/lxc/incus/v6/internal/jmap"
"github.com/lxc/incus/v6/internal/server/db/operationtype"
"github.com/lxc/incus/v6/internal/server/operations"
"github.com/lxc/incus/v6/internal/server/response"
internalUtil "github.com/lxc/incus/v6/internal/util"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/ws"
"github.com/lxc/incus/v7/internal/jmap"
"github.com/lxc/incus/v7/internal/server/db/operationtype"
"github.com/lxc/incus/v7/internal/server/operations"
"github.com/lxc/incus/v7/internal/server/response"
internalUtil "github.com/lxc/incus/v7/internal/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/ws"
)
const (
cmd/incus-agent/main.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v7/internal/version"
)
type cmdGlobal struct {
cmd/incus-agent/main_agent.go
+4 -4
View File
@@ -13,10 +13,10 @@ import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/internal/server/instance/instancetype"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/subprocess"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/internal/server/instance/instancetype"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/subprocess"
"github.com/lxc/incus/v7/shared/util"
)
var (
cmd/incus-agent/metrics.go
+3 -3
View File
@@ -7,9 +7,9 @@ import (
"github.com/shirou/gopsutil/v4/host"
"github.com/lxc/incus/v6/internal/server/metrics"
"github.com/lxc/incus/v6/internal/server/response"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v7/internal/server/metrics"
"github.com/lxc/incus/v7/internal/server/response"
"github.com/lxc/incus/v7/shared/logger"
)
var metricsCmd = APIEndpoint{
cmd/incus-agent/network.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"net"
"sync"
"github.com/lxc/incus/v6/internal/server/util"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v7/internal/server/util"
localtls "github.com/lxc/incus/v7/shared/tls"
)
// A variation of the standard tls.Listener that supports atomically swapping
cmd/incus-agent/operations.go
+5 -5
View File
@@ -9,11 +9,11 @@ import (
"strings"
"time"
"github.com/lxc/incus/v6/internal/jmap"
"github.com/lxc/incus/v6/internal/server/operations"
"github.com/lxc/incus/v6/internal/server/response"
localUtil "github.com/lxc/incus/v6/internal/server/util"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/internal/jmap"
"github.com/lxc/incus/v7/internal/server/operations"
"github.com/lxc/incus/v7/internal/server/response"
localUtil "github.com/lxc/incus/v7/internal/server/util"
"github.com/lxc/incus/v7/shared/api"
)
var operationCmd = APIEndpoint{
cmd/incus-agent/os_bsd.go
+3 -3
View File
@@ -16,9 +16,9 @@ import (
"golang.org/x/sys/unix"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/logger"
)
var (
cmd/incus-agent/os_common.go
+2 -2
View File
@@ -17,8 +17,8 @@ import (
psUtilNet "github.com/shirou/gopsutil/v4/net"
"github.com/shirou/gopsutil/v4/process"
"github.com/lxc/incus/v6/internal/server/metrics"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/internal/server/metrics"
"github.com/lxc/incus/v7/shared/api"
)
var (
cmd/incus-agent/os_darwin.go
+4 -4
View File
@@ -16,10 +16,10 @@ import (
"github.com/shirou/gopsutil/v4/disk"
"golang.org/x/sys/unix"
"github.com/lxc/incus/v6/internal/server/metrics"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/revert"
"github.com/lxc/incus/v6/shared/subprocess"
"github.com/lxc/incus/v7/internal/server/metrics"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/revert"
"github.com/lxc/incus/v7/shared/subprocess"
)
func osMountShared(src string, dst string, fstype string, opts []string) error {
cmd/incus-agent/os_freebsd.go
+6 -6
View File
@@ -17,12 +17,12 @@ import (
"github.com/shirou/gopsutil/v4/disk"
"golang.org/x/sys/unix"
"github.com/lxc/incus/v6/internal/server/metrics"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/osarch"
"github.com/lxc/incus/v6/shared/revert"
"github.com/lxc/incus/v6/shared/subprocess"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/internal/server/metrics"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/osarch"
"github.com/lxc/incus/v7/shared/revert"
"github.com/lxc/incus/v7/shared/subprocess"
"github.com/lxc/incus/v7/shared/util"
)
// isMountPoint returns true if path is a mount point.
cmd/incus-agent/os_linux.go
+12 -12
View File
@@ -26,18 +26,18 @@ import (
"github.com/shirou/gopsutil/v4/process"
"golang.org/x/sys/unix"
"github.com/lxc/incus/v6/internal/linux"
"github.com/lxc/incus/v6/internal/ports"
deviceConfig "github.com/lxc/incus/v6/internal/server/device/config"
"github.com/lxc/incus/v6/internal/server/ip"
"github.com/lxc/incus/v6/internal/server/metrics"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/osarch"
"github.com/lxc/incus/v6/shared/revert"
"github.com/lxc/incus/v6/shared/subprocess"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/internal/linux"
"github.com/lxc/incus/v7/internal/ports"
deviceConfig "github.com/lxc/incus/v7/internal/server/device/config"
"github.com/lxc/incus/v7/internal/server/ip"
"github.com/lxc/incus/v7/internal/server/metrics"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/osarch"
"github.com/lxc/incus/v7/shared/revert"
"github.com/lxc/incus/v7/shared/subprocess"
"github.com/lxc/incus/v7/shared/util"
)
var (
cmd/incus-agent/os_windows.go
+5 -5
View File
@@ -23,11 +23,11 @@ import (
"golang.org/x/sys/windows/svc/debug"
"golang.org/x/sys/windows/svc/eventlog"
"github.com/lxc/incus/v6/internal/ports"
"github.com/lxc/incus/v6/internal/server/metrics"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v7/internal/ports"
"github.com/lxc/incus/v7/internal/server/metrics"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/logger"
)
var (
cmd/incus-agent/response.go
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import (
"net/http"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"
)
type devIncusResponse struct {
cmd/incus-agent/server.go
+5 -5
View File
@@ -10,11 +10,11 @@ import (
"net/http"
"time"
internalIO "github.com/lxc/incus/v6/internal/io"
"github.com/lxc/incus/v6/internal/server/response"
localUtil "github.com/lxc/incus/v6/internal/server/util"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v6/shared/util"
internalIO "github.com/lxc/incus/v7/internal/io"
"github.com/lxc/incus/v7/internal/server/response"
localUtil "github.com/lxc/incus/v7/internal/server/util"
"github.com/lxc/incus/v7/shared/logger"
"github.com/lxc/incus/v7/shared/util"
)
func restServer(tlsConfig *tls.Config, cert *x509.Certificate, debug bool, d *Daemon) *http.Server {
cmd/incus-agent/sftp.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/pkg/sftp"
"github.com/lxc/incus/v6/internal/server/response"
"github.com/lxc/incus/v7/internal/server/response"
)
var sftpCmd = APIEndpoint{
cmd/incus-agent/state.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"errors"
"net/http"
"github.com/lxc/incus/v6/internal/server/response"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/internal/server/response"
"github.com/lxc/incus/v7/shared/api"
)
var stateCmd = APIEndpoint{
cmd/incus-agent/templates.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"go.yaml.in/yaml/v4"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/util"
)
func templatesApply(path string) ([]string, error) {
cmd/incus-benchmark/benchmark.go
+4 -4
View File
@@ -6,10 +6,10 @@ import (
"sync"
"time"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/api"
config "github.com/lxc/incus/v6/shared/cliconfig"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/api"
config "github.com/lxc/incus/v7/shared/cliconfig"
)
const userConfigKey = "user.incus-benchmark"
cmd/incus-benchmark/benchmark_operation.go
+2 -2
View File
@@ -1,8 +1,8 @@
package main
import (
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/shared/api"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/shared/api"
)
func createContainer(c incus.InstanceServer, fingerprint string, name string, privileged bool) error {
cmd/incus-benchmark/main.go
+4 -4
View File
@@ -6,10 +6,10 @@ import (
"github.com/spf13/cobra"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/util"
)
type cmdGlobal struct {
cmd/incus-migrate/main.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/ask"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/ask"
)
type cmdGlobal struct {
cmd/incus-migrate/main_migrate.go
+8 -8
View File
@@ -18,14 +18,14 @@ import (
"github.com/spf13/cobra"
"golang.org/x/sys/unix"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/linux"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/archive"
"github.com/lxc/incus/v6/shared/ask"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/linux"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/archive"
"github.com/lxc/incus/v7/shared/ask"
localtls "github.com/lxc/incus/v7/shared/tls"
"github.com/lxc/incus/v7/shared/util"
)
// Migrator defines the methods required to perform a migration.
cmd/incus-migrate/main_netcat.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/internal/eagain"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/internal/eagain"
"github.com/lxc/incus/v7/shared/util"
)
type cmdNetcat struct {
cmd/incus-migrate/migrate_instance.go
+8 -8
View File
@@ -12,14 +12,14 @@ import (
"go.yaml.in/yaml/v4"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/ask"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v6/shared/osarch"
"github.com/lxc/incus/v6/shared/revert"
"github.com/lxc/incus/v6/shared/units"
"github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/ask"
cli "github.com/lxc/incus/v7/shared/cmd"
"github.com/lxc/incus/v7/shared/osarch"
"github.com/lxc/incus/v7/shared/revert"
"github.com/lxc/incus/v7/shared/units"
"github.com/lxc/incus/v7/shared/util"
)
// InstanceMigration handles the migration logic for an instance.
cmd/incus-migrate/migrate_ova.go
+5 -5
View File
@@ -12,11 +12,11 @@ import (
"slices"
"strings"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/archive"
"github.com/lxc/incus/v6/shared/ask"
"github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/archive"
"github.com/lxc/incus/v7/shared/ask"
"github.com/lxc/incus/v7/shared/util"
)
// VHResourceType defines what kind of resource this is (e.g., CPU, memory).
cmd/incus-migrate/migrate_volume.go
+6 -6
View File
@@ -12,12 +12,12 @@ import (
"go.yaml.in/yaml/v4"
incus "github.com/lxc/incus/v6/client"
internalUtil "github.com/lxc/incus/v6/internal/util"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/ask"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v6/shared/revert"
incus "github.com/lxc/incus/v7/client"
internalUtil "github.com/lxc/incus/v7/internal/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/ask"
cli "github.com/lxc/incus/v7/shared/cmd"
"github.com/lxc/incus/v7/shared/revert"
)
// VolumeMigration handles the migration logic for an custom volume.
cmd/incus-migrate/transfer.go
+4 -4
View File
@@ -12,10 +12,10 @@ import (
"github.com/google/uuid"
"github.com/gorilla/websocket"
"github.com/lxc/incus/v6/internal/linux"
"github.com/lxc/incus/v6/internal/migration"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v6/shared/ws"
"github.com/lxc/incus/v7/internal/linux"
"github.com/lxc/incus/v7/internal/migration"
"github.com/lxc/incus/v7/shared/util"
"github.com/lxc/incus/v7/shared/ws"
)
// Send an rsync stream of a path over a websocket.
cmd/incus-migrate/utils.go
+10 -10
View File
@@ -15,16 +15,16 @@ import (
"golang.org/x/sys/unix"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/linux"
"github.com/lxc/incus/v6/internal/migration"
"github.com/lxc/incus/v6/internal/ports"
internalUtil "github.com/lxc/incus/v6/internal/util"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/api"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v6/shared/ws"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/linux"
"github.com/lxc/incus/v7/internal/migration"
"github.com/lxc/incus/v7/internal/ports"
internalUtil "github.com/lxc/incus/v7/internal/util"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/api"
localtls "github.com/lxc/incus/v7/shared/tls"
"github.com/lxc/incus/v7/shared/util"
"github.com/lxc/incus/v7/shared/ws"
)
// MigrationType represents the type of the migration.
cmd/incus-simplestreams/main.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v7/internal/version"
)
type cmdGlobal struct {
cmd/incus-simplestreams/main_add.go
+7 -7
View File
@@ -16,13 +16,13 @@ import (
"github.com/spf13/cobra"
"go.yaml.in/yaml/v4"
internalUtil "github.com/lxc/incus/v6/internal/util"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/archive"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v6/shared/osarch"
"github.com/lxc/incus/v6/shared/simplestreams"
"github.com/lxc/incus/v6/shared/util"
internalUtil "github.com/lxc/incus/v7/internal/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/archive"
cli "github.com/lxc/incus/v7/shared/cmd"
"github.com/lxc/incus/v7/shared/osarch"
"github.com/lxc/incus/v7/shared/simplestreams"
"github.com/lxc/incus/v7/shared/util"
)
type cmdAdd struct {
cmd/incus-simplestreams/main_generate_metadata.go
+4 -4
View File
@@ -12,10 +12,10 @@ import (
"github.com/spf13/cobra"
yaml "go.yaml.in/yaml/v4"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/ask"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v6/shared/osarch"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/ask"
cli "github.com/lxc/incus/v7/shared/cmd"
"github.com/lxc/incus/v7/shared/osarch"
)
type cmdGenerateMetadata struct {
cmd/incus-simplestreams/main_list.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/spf13/cobra"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v6/shared/simplestreams"
cli "github.com/lxc/incus/v7/shared/cmd"
"github.com/lxc/incus/v7/shared/simplestreams"
)
type cmdList struct {
cmd/incus-simplestreams/main_prune.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"github.com/spf13/cobra"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v6/shared/simplestreams"
cli "github.com/lxc/incus/v7/shared/cmd"
"github.com/lxc/incus/v7/shared/simplestreams"
)
type cmdPrune struct {
cmd/incus-simplestreams/main_remove.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"github.com/spf13/cobra"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v6/shared/simplestreams"
cli "github.com/lxc/incus/v7/shared/cmd"
"github.com/lxc/incus/v7/shared/simplestreams"
)
type cmdRemove struct {
cmd/incus-simplestreams/main_verify.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
"github.com/spf13/cobra"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v6/shared/simplestreams"
"github.com/lxc/incus/v6/shared/util"
cli "github.com/lxc/incus/v7/shared/cmd"
"github.com/lxc/incus/v7/shared/simplestreams"
"github.com/lxc/incus/v7/shared/util"
)
type cmdVerify struct {
cmd/incus-simplestreams/utils.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"os"
"github.com/lxc/incus/v6/shared/simplestreams"
"github.com/lxc/incus/v7/shared/simplestreams"
)
func writeIndex(products *simplestreams.Products) error {
cmd/incus-user/main.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/internal/version"
"github.com/lxc/incus/v6/shared/logger"
"github.com/lxc/incus/v7/internal/version"
"github.com/lxc/incus/v7/shared/logger"
)
type cmdGlobal struct {
cmd/incus-user/main_daemon.go
+4 -4
View File
@@ -12,10 +12,10 @@ import (
"github.com/spf13/cobra"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/linux"
internalUtil "github.com/lxc/incus/v6/internal/util"
"github.com/lxc/incus/v6/shared/logger"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/linux"
internalUtil "github.com/lxc/incus/v7/internal/util"
"github.com/lxc/incus/v7/shared/logger"
)
var (
cmd/incus-user/proxy.go
+4 -4
View File
@@ -9,10 +9,10 @@ import (
log "github.com/sirupsen/logrus"
"github.com/lxc/incus/v6/internal/linux"
internalUtil "github.com/lxc/incus/v6/internal/util"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/internal/linux"
internalUtil "github.com/lxc/incus/v7/internal/util"
localtls "github.com/lxc/incus/v7/shared/tls"
"github.com/lxc/incus/v7/shared/util"
)
func tlsConfig(uid uint32) (*tls.Config, error) {
cmd/incus-user/server.go
+9 -9
View File
@@ -11,15 +11,15 @@ import (
"strconv"
"strings"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/linux"
internalUtil "github.com/lxc/incus/v6/internal/util"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/idmap"
"github.com/lxc/incus/v6/shared/revert"
"github.com/lxc/incus/v6/shared/subprocess"
localtls "github.com/lxc/incus/v6/shared/tls"
"github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/linux"
internalUtil "github.com/lxc/incus/v7/internal/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/idmap"
"github.com/lxc/incus/v7/shared/revert"
"github.com/lxc/incus/v7/shared/subprocess"
localtls "github.com/lxc/incus/v7/shared/tls"
"github.com/lxc/incus/v7/shared/util"
)
func serverIsConfigured(client incus.InstanceServer) (bool, error) {
cmd/incus/action.go
+7 -7
View File
@@ -10,13 +10,13 @@ import (
"github.com/spf13/cobra"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/cmd/incus/color"
u "github.com/lxc/incus/v6/cmd/incus/usage"
"github.com/lxc/incus/v6/internal/i18n"
"github.com/lxc/incus/v6/shared/api"
config "github.com/lxc/incus/v6/shared/cliconfig"
cli "github.com/lxc/incus/v6/shared/cmd"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/cmd/incus/color"
u "github.com/lxc/incus/v7/cmd/incus/usage"
"github.com/lxc/incus/v7/internal/i18n"
"github.com/lxc/incus/v7/shared/api"
config "github.com/lxc/incus/v7/shared/cliconfig"
cli "github.com/lxc/incus/v7/shared/cmd"
)
// Start.
cmd/incus/admin.go
+3 -3
View File
@@ -5,9 +5,9 @@ package main
import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/cmd/incus/color"
"github.com/lxc/incus/v6/internal/i18n"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v7/cmd/incus/color"
"github.com/lxc/incus/v7/internal/i18n"
cli "github.com/lxc/incus/v7/shared/cmd"
)
type cmdAdmin struct {
cmd/incus/admin_cluster.go
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/cmd/incus/color"
"github.com/lxc/incus/v6/internal/i18n"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/cmd/incus/color"
"github.com/lxc/incus/v7/internal/i18n"
cli "github.com/lxc/incus/v7/shared/cmd"
"github.com/lxc/incus/v7/shared/util"
)
type cmdAdminCluster struct {
cmd/incus/admin_init.go
+7 -7
View File
@@ -8,13 +8,13 @@ import (
"github.com/spf13/cobra"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/cmd/incus/color"
u "github.com/lxc/incus/v6/cmd/incus/usage"
"github.com/lxc/incus/v6/internal/i18n"
"github.com/lxc/incus/v6/internal/ports"
"github.com/lxc/incus/v6/shared/api"
cli "github.com/lxc/incus/v6/shared/cmd"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/cmd/incus/color"
u "github.com/lxc/incus/v7/cmd/incus/usage"
"github.com/lxc/incus/v7/internal/i18n"
"github.com/lxc/incus/v7/internal/ports"
"github.com/lxc/incus/v7/shared/api"
cli "github.com/lxc/incus/v7/shared/cmd"
)
type cmdAdminInit struct {
cmd/incus/admin_init_auto.go
+7 -7
View File
@@ -7,13 +7,13 @@ import (
"fmt"
"slices"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/i18n"
"github.com/lxc/incus/v6/internal/linux"
"github.com/lxc/incus/v6/internal/ports"
internalUtil "github.com/lxc/incus/v6/internal/util"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/i18n"
"github.com/lxc/incus/v7/internal/linux"
"github.com/lxc/incus/v7/internal/ports"
internalUtil "github.com/lxc/incus/v7/internal/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/util"
)
func (c *cmdAdminInit) runAuto(d incus.InstanceServer, server *api.Server) (*api.InitPreseed, error) {
cmd/incus/admin_init_dump.go
+3 -3
View File
@@ -7,9 +7,9 @@ import (
yaml "go.yaml.in/yaml/v4"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/i18n"
"github.com/lxc/incus/v6/shared/api"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/i18n"
"github.com/lxc/incus/v7/shared/api"
)
func (c *cmdAdminInit) runDump(d incus.InstanceServer) error {
cmd/incus/admin_init_interactive.go
+9 -9
View File
@@ -15,15 +15,15 @@ import (
"go.yaml.in/yaml/v4"
"golang.org/x/sys/unix"
incus "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/internal/i18n"
"github.com/lxc/incus/v6/internal/linux"
"github.com/lxc/incus/v6/internal/ports"
internalUtil "github.com/lxc/incus/v6/internal/util"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v6/shared/subprocess"
"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v6/shared/validate"
incus "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/internal/i18n"
"github.com/lxc/incus/v7/internal/linux"
"github.com/lxc/incus/v7/internal/ports"
internalUtil "github.com/lxc/incus/v7/internal/util"
"github.com/lxc/incus/v7/shared/api"
"github.com/lxc/incus/v7/shared/subprocess"
"github.com/lxc/incus/v7/shared/util"
"github.com/lxc/incus/v7/shared/validate"
)
func (c *cmdAdminInit) runInteractive(_ *cobra.Command, d incus.InstanceServer, server *api.Server) (*api.InitPreseed, error) {
cmd/incus/admin_init_preseed.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"go.yaml.in/yaml/v4"
u "github.com/lxc/incus/v6/cmd/incus/usage"
"github.com/lxc/incus/v6/internal/i18n"
"github.com/lxc/incus/v6/shared/api"
u "github.com/lxc/incus/v7/cmd/incus/usage"
"github.com/lxc/incus/v7/internal/i18n"
"github.com/lxc/incus/v7/shared/api"
)
func (c *cmdAdminInit) runPreseed(p *u.Parsed) (*api.InitPreseed, error) {
cmd/incus/admin_other.go
+3 -3
View File
@@ -5,9 +5,9 @@ package main
import (
"github.com/spf13/cobra"
"github.com/lxc/incus/v6/cmd/incus/color"
"github.com/lxc/incus/v6/internal/i18n"
cli "github.com/lxc/incus/v6/shared/cmd"
"github.com/lxc/incus/v7/cmd/incus/color"
"github.com/lxc/incus/v7/internal/i18n"
cli "github.com/lxc/incus/v7/shared/cmd"
)
type cmdAdmin struct {

Some files were not shown because too many files have changed in this diff Show More