From d46d4acd1c0dc6a5449b820850fab3f53b02597f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 11 Apr 2022 23:00:02 -0400 Subject: [PATCH 01/87] lxd/devlxd: Don't expand format strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This must have been around a long time but only became visible now that cloud-init is making use of /dev/lxd. Closes #10231 Signed-off-by: Stéphane Graber (cherry picked from commit 2c5b0078a0e84ab62c9494e32e131d0686bb0c18) Signed-off-by: Simon Deziel --- lxd/devlxd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxd/devlxd.go b/lxd/devlxd.go index a8555ec8dec5..f50bc082aab7 100644 --- a/lxd/devlxd.go +++ b/lxd/devlxd.go @@ -185,7 +185,7 @@ func hoistReq(f func(*Daemon, instance.Instance, http.ResponseWriter, *http.Requ util.WriteJSON(w, resp.content, debugLogger) } else if resp.ctype != "websocket" { w.Header().Set("Content-Type", "application/octet-stream") - fmt.Fprintf(w, resp.content.(string)) + fmt.Fprint(w, resp.content.(string)) } } } From bc8f74fc432da390a746b3d70c5205dc6ae1473b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 7 Mar 2022 18:07:12 -0500 Subject: [PATCH 02/87] lxd/instance/qemu: Set spawn=allow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit spawn=allow is required when QEMU is asked to daemonize. Previous QEMU versions would incorrectly block `fork` when spawn=deny was passed while allowing clone to succeed. This was then making it possible for us to use daemnize thanks to most Linux distributions using the clone syscall to implement fork. Current QEMU has fixed their seccomp profile to block both fork and clone, preventing -daemonize when spawn=deny is passed. Signed-off-by: Stéphane Graber (cherry picked from commit af5c49e020877c238510eb096ac586e9708721a6) Signed-off-by: Simon Deziel --- lxd/instance/drivers/driver_qemu.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go index 42cc9c69d924..34a9e9765f84 100644 --- a/lxd/instance/drivers/driver_qemu.go +++ b/lxd/instance/drivers/driver_qemu.go @@ -1279,7 +1279,7 @@ func (d *qemu) Start(stateful bool) error { "-serial", "chardev:console", "-nodefaults", "-no-user-config", - "-sandbox", "on,obsolete=deny,elevateprivileges=allow,spawn=deny,resourcecontrol=deny", + "-sandbox", "on,obsolete=deny,elevateprivileges=allow,spawn=allow,resourcecontrol=deny", "-readconfig", confFile, "-spice", d.spiceCmdlineConfig(), "-pidfile", d.pidFilePath(), From b7478f97c547368868ea9d41bd3ac283cbd54c11 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Fri, 5 Jul 2024 11:10:51 -0400 Subject: [PATCH 03/87] *: mass rename github.com/lxc/lxd -> github.com/canonical/lxd ``` for f in $(git grep -lF github.com/lxc/lxd); do sed -i 's|github.com/lxc/lxd|github.com/canonical/lxd|g' "${f}" done ``` Signed-off-by: Simon Deziel --- .sphinx/_templates/header.html | 2 +- .sphinx/conf.py | 2 +- CONTRIBUTING.md | 4 +- README.md | 8 +- client/connection.go | 6 +- client/events.go | 2 +- client/interfaces.go | 6 +- client/lxd.go | 6 +- client/lxd_certificates.go | 2 +- client/lxd_cluster.go | 2 +- client/lxd_containers.go | 10 +- client/lxd_events.go | 4 +- client/lxd_images.go | 10 +- client/lxd_instances.go | 10 +- client/lxd_network_acls.go | 2 +- client/lxd_network_forwards.go | 2 +- client/lxd_network_peer.go | 2 +- client/lxd_network_zones.go | 2 +- client/lxd_networks.go | 2 +- client/lxd_operations.go | 2 +- client/lxd_profiles.go | 2 +- client/lxd_projects.go | 2 +- client/lxd_server.go | 4 +- client/lxd_storage_pools.go | 2 +- client/lxd_storage_volumes.go | 10 +- client/lxd_warnings.go | 2 +- client/operations.go | 2 +- client/simplestreams.go | 2 +- client/simplestreams_images.go | 4 +- client/util.go | 2 +- doc/database.md | 2 +- doc/external_resources.md | 2 +- doc/installing.md | 2 +- doc/metadata.yaml | 2 +- doc/rest-api.md | 2 +- doc/rest-api.yaml | 320 +++++++++--------- doc/security.md | 2 +- fuidshift/main.go | 2 +- fuidshift/main_shift.go | 2 +- go.mod | 2 +- lxc-to-lxd/config.go | 2 +- lxc-to-lxd/main.go | 2 +- lxc-to-lxd/main_migrate.go | 12 +- lxc-to-lxd/main_netcat.go | 2 +- lxc-to-lxd/transfer.go | 6 +- lxc-to-lxd/utils.go | 4 +- lxc/action.go | 12 +- lxc/alias.go | 6 +- lxc/cluster.go | 12 +- lxc/config.go | 12 +- lxc/config/cert.go | 2 +- lxc/config/file.go | 2 +- lxc/config/remote.go | 4 +- lxc/config_device.go | 4 +- lxc/config_metadata.go | 10 +- lxc/config_template.go | 10 +- lxc/config_trust.go | 10 +- lxc/console.go | 14 +- lxc/console_unix.go | 2 +- lxc/copy.go | 14 +- lxc/delete.go | 10 +- lxc/exec.go | 12 +- lxc/exec_unix.go | 4 +- lxc/exec_windows.go | 4 +- lxc/export.go | 12 +- lxc/file.go | 18 +- lxc/image.go | 14 +- lxc/image_alias.go | 8 +- lxc/import.go | 14 +- lxc/info.go | 14 +- lxc/init.go | 14 +- lxc/launch.go | 8 +- lxc/list.go | 18 +- lxc/list_test.go | 4 +- lxc/main.go | 16 +- lxc/main_aliases.go | 6 +- lxc/main_test.go | 2 +- lxc/manpage.go | 6 +- lxc/monitor.go | 12 +- lxc/move.go | 10 +- lxc/network.go | 14 +- lxc/operation.go | 6 +- lxc/profile.go | 12 +- lxc/project.go | 12 +- lxc/publish.go | 12 +- lxc/query.go | 6 +- lxc/remote.go | 14 +- lxc/rename.go | 4 +- lxc/restore.go | 8 +- lxc/snapshot.go | 8 +- lxc/storage.go | 14 +- lxc/storage_volume.go | 14 +- lxc/utils.go | 8 +- lxc/utils/cancel.go | 4 +- lxc/utils/progress.go | 6 +- lxc/utils/table.go | 2 +- lxc/utils_test.go | 2 +- lxc/version.go | 6 +- lxd-agent/api.go | 2 +- lxd-agent/api_1.0.go | 8 +- lxd-agent/daemon.go | 2 +- lxd-agent/devlxd.go | 10 +- lxd-agent/events.go | 6 +- lxd-agent/exec.go | 16 +- lxd-agent/file.go | 4 +- lxd-agent/main.go | 2 +- lxd-agent/main_agent.go | 12 +- lxd-agent/network.go | 4 +- lxd-agent/operations.go | 10 +- lxd-agent/server.go | 8 +- lxd-agent/state.go | 6 +- lxd-agent/templates.go | 4 +- lxd-benchmark/benchmark/benchmark.go | 8 +- lxd-benchmark/benchmark/operation.go | 4 +- lxd-benchmark/main.go | 8 +- lxd-benchmark/main_delete.go | 2 +- lxd-benchmark/main_init.go | 2 +- lxd-benchmark/main_launch.go | 2 +- lxd-benchmark/main_start.go | 2 +- lxd-benchmark/main_stop.go | 2 +- lxd-p2c/main.go | 2 +- lxd-p2c/main_migrate.go | 6 +- lxd-p2c/main_netcat.go | 2 +- lxd-p2c/transfer.go | 6 +- lxd-p2c/utils.go | 10 +- lxd/api.go | 14 +- lxd/api_1.0.go | 34 +- lxd/api_cluster.go | 34 +- lxd/api_cluster_test.go | 8 +- lxd/api_internal.go | 38 +-- lxd/api_internal_recover.go | 30 +- lxd/api_internal_test.go | 2 +- lxd/api_networks_test.go | 2 +- lxd/api_project.go | 26 +- lxd/api_storage_pools_test.go | 2 +- lxd/apparmor/apparmor.go | 6 +- lxd/apparmor/instance.go | 12 +- lxd/apparmor/instance_forkproxy.go | 10 +- lxd/apparmor/network.go | 2 +- lxd/apparmor/network_dnsmasq.go | 4 +- lxd/apparmor/network_forkdns.go | 6 +- lxd/backup.go | 40 +-- lxd/backup/backup_common.go | 2 +- lxd/backup/backup_config.go | 12 +- lxd/backup/backup_info.go | 2 +- lxd/backup/backup_instance.go | 12 +- lxd/backup/backup_utils.go | 2 +- lxd/certificates.go | 28 +- lxd/cgroup/abstraction.go | 2 +- lxd/cgroup/file.go | 2 +- lxd/cgroup/init.go | 4 +- lxd/cluster/config.go | 6 +- lxd/cluster/config_test.go | 4 +- lxd/cluster/connect.go | 20 +- lxd/cluster/events.go | 14 +- lxd/cluster/gateway.go | 10 +- lxd/cluster/gateway_export_test.go | 4 +- lxd/cluster/gateway_test.go | 8 +- lxd/cluster/heartbeat.go | 14 +- lxd/cluster/heartbeat_test.go | 12 +- lxd/cluster/info.go | 8 +- lxd/cluster/membership.go | 16 +- lxd/cluster/membership_test.go | 12 +- lxd/cluster/migrate.go | 4 +- lxd/cluster/migrate_test.go | 4 +- lxd/cluster/notify.go | 12 +- lxd/cluster/notify_test.go | 16 +- lxd/cluster/raft_test.go | 6 +- lxd/cluster/recover.go | 4 +- lxd/cluster/resolve.go | 2 +- lxd/cluster/tls.go | 8 +- lxd/cluster/upgrade.go | 10 +- lxd/cluster/upgrade_test.go | 8 +- lxd/config/map.go | 2 +- lxd/config/map_test.go | 2 +- lxd/config/safe.go | 2 +- lxd/config/safe_test.go | 2 +- lxd/config/schema.go | 2 +- lxd/config/schema_test.go | 2 +- lxd/config/validators_test.go | 2 +- lxd/daemon.go | 60 ++-- lxd/daemon_config.go | 10 +- lxd/daemon_images.go | 30 +- lxd/daemon_integration_test.go | 8 +- lxd/daemon_storage.go | 16 +- lxd/db/backups.go | 2 +- lxd/db/certificates.go | 4 +- lxd/db/certificates.mapper.go | 6 +- lxd/db/certificates_test.go | 2 +- lxd/db/cluster/constants.go | 2 +- lxd/db/cluster/open.go | 14 +- lxd/db/cluster/open_test.go | 8 +- lxd/db/cluster/query.go | 2 +- lxd/db/cluster/update.go | 10 +- lxd/db/cluster/update_test.go | 6 +- lxd/db/config.go | 2 +- lxd/db/config.mapper.go | 4 +- lxd/db/config_test.go | 2 +- lxd/db/db.go | 10 +- lxd/db/db_internal_test.go | 6 +- lxd/db/db_test.go | 4 +- lxd/db/devices.mapper.go | 4 +- lxd/db/generate/db.go | 6 +- lxd/db/generate/db/constants.go | 6 +- lxd/db/generate/db/lex.go | 2 +- lxd/db/generate/db/mapping.go | 4 +- lxd/db/generate/db/method.go | 4 +- lxd/db/generate/db/parse.go | 4 +- lxd/db/generate/db/parse_test.go | 2 +- lxd/db/generate/db/schema.go | 4 +- lxd/db/generate/db/stmt.go | 4 +- lxd/db/generate/lex/parse.go | 2 +- lxd/db/generate/lex/parse_test.go | 2 +- lxd/db/images.go | 8 +- lxd/db/images.mapper.go | 8 +- lxd/db/images_test.go | 2 +- lxd/db/instance_profiles.mapper.go | 6 +- lxd/db/instances.go | 10 +- lxd/db/instances.mapper.go | 8 +- lxd/db/instances_test.go | 8 +- lxd/db/legacy.go | 2 +- lxd/db/migration.go | 6 +- lxd/db/migration_test.go | 4 +- lxd/db/networks.go | 8 +- lxd/db/networks_test.go | 2 +- lxd/db/node.go | 14 +- lxd/db/node/open.go | 6 +- lxd/db/node/open_test.go | 2 +- lxd/db/node/update.go | 10 +- lxd/db/node/update_test.go | 6 +- lxd/db/node_test.go | 8 +- lxd/db/operations.go | 2 +- lxd/db/operations.mapper.go | 6 +- lxd/db/operations_test.go | 2 +- lxd/db/patches.go | 2 +- lxd/db/profiles.go | 4 +- lxd/db/profiles.mapper.go | 8 +- lxd/db/projects.go | 6 +- lxd/db/projects.mapper.go | 8 +- lxd/db/projects_test.go | 2 +- lxd/db/query/config_test.go | 2 +- lxd/db/query/count_test.go | 2 +- lxd/db/query/dump_test.go | 2 +- lxd/db/query/objects_test.go | 2 +- lxd/db/query/retry.go | 2 +- lxd/db/query/slices_test.go | 2 +- lxd/db/query/transaction.go | 2 +- lxd/db/query/transaction_test.go | 2 +- lxd/db/raft.go | 2 +- lxd/db/raft_test.go | 2 +- lxd/db/schema/query.go | 4 +- lxd/db/schema/schema.go | 4 +- lxd/db/schema/schema_test.go | 6 +- lxd/db/schema/update_test.go | 4 +- lxd/db/snapshots.go | 2 +- lxd/db/snapshots.mapper.go | 6 +- lxd/db/snapshots_test.go | 4 +- lxd/db/storage_pools.go | 6 +- lxd/db/storage_pools_export_test.go | 2 +- lxd/db/storage_pools_test.go | 2 +- lxd/db/storage_volume_snapshots.go | 4 +- lxd/db/storage_volumes.go | 8 +- lxd/db/storage_volumes_test.go | 2 +- lxd/device/config/device_runconfig.go | 2 +- lxd/device/device_common.go | 12 +- lxd/device/device_interface.go | 8 +- lxd/device/device_load.go | 8 +- lxd/device/device_utils_disk.go | 14 +- lxd/device/device_utils_generic.go | 2 +- lxd/device/device_utils_gpu.go | 2 +- lxd/device/device_utils_infiniband.go | 6 +- lxd/device/device_utils_instance.go | 2 +- lxd/device/device_utils_network.go | 22 +- lxd/device/device_utils_proxy.go | 8 +- lxd/device/device_utils_unix.go | 12 +- lxd/device/device_utils_unix_events.go | 10 +- .../device_utils_unix_hotplug_events.go | 8 +- lxd/device/device_utils_usb_events.go | 8 +- lxd/device/disk.go | 32 +- lxd/device/gpu.go | 2 +- lxd/device/gpu_mdev.go | 14 +- lxd/device/gpu_mig.go | 14 +- lxd/device/gpu_physical.go | 14 +- lxd/device/gpu_sriov.go | 16 +- lxd/device/infiniband_physical.go | 12 +- lxd/device/infiniband_sriov.go | 16 +- lxd/device/nic.go | 6 +- lxd/device/nic_bridged.go | 30 +- lxd/device/nic_ipvlan.go | 16 +- lxd/device/nic_macvlan.go | 14 +- lxd/device/nic_p2p.go | 12 +- lxd/device/nic_physical.go | 18 +- lxd/device/nic_routed.go | 18 +- lxd/device/nic_sriov.go | 12 +- lxd/device/nictype/nictype.go | 4 +- lxd/device/none.go | 4 +- lxd/device/pci/pci.go | 4 +- lxd/device/pci/pci_test.go | 2 +- lxd/device/proxy.go | 26 +- lxd/device/unix_common.go | 14 +- lxd/device/unix_hotplug.go | 10 +- lxd/device/usb.go | 12 +- lxd/devices.go | 20 +- lxd/devlxd.go | 22 +- lxd/devlxd_test.go | 4 +- lxd/dnsmasq/dhcpalloc/dhcpalloc.go | 8 +- lxd/dnsmasq/dnsmasq.go | 8 +- lxd/endpoints/cluster.go | 8 +- lxd/endpoints/devlxd_test.go | 2 +- lxd/endpoints/endpoints.go | 8 +- lxd/endpoints/endpoints_exported_test.go | 4 +- lxd/endpoints/endpoints_test.go | 10 +- lxd/endpoints/listeners/fancytls.go | 4 +- lxd/endpoints/listeners/starttls.go | 4 +- lxd/endpoints/local_test.go | 2 +- lxd/endpoints/network.go | 8 +- lxd/endpoints/network_test.go | 2 +- lxd/endpoints/pprof.go | 6 +- lxd/endpoints/socket.go | 6 +- lxd/events.go | 10 +- lxd/events/common.go | 4 +- lxd/events/devlxdEvents.go | 4 +- lxd/events/events.go | 6 +- lxd/events/logging.go | 2 +- lxd/filter/clause.go | 2 +- lxd/filter/clause_test.go | 2 +- lxd/filter/match_test.go | 4 +- lxd/filter/value_test.go | 4 +- lxd/firewall/drivers/drivers_nftables.go | 6 +- lxd/firewall/drivers/drivers_xtables.go | 10 +- lxd/firewall/firewall_interface.go | 2 +- lxd/firewall/firewall_load.go | 4 +- lxd/fsmonitor/drivers/common.go | 2 +- lxd/fsmonitor/drivers/driver_fsnotify.go | 2 +- lxd/fsmonitor/drivers/interface.go | 2 +- lxd/fsmonitor/drivers/load.go | 2 +- lxd/fsmonitor/fsmonitor.go | 4 +- lxd/fsmonitor/load.go | 8 +- lxd/images.go | 46 +-- lxd/init.go | 8 +- lxd/instance.go | 24 +- lxd/instance/drivers/driver_common.go | 36 +- lxd/instance/drivers/driver_lxc.go | 58 ++-- lxd/instance/drivers/driver_lxc_cmd.go | 4 +- lxd/instance/drivers/driver_qemu.go | 64 ++-- lxd/instance/drivers/driver_qemu_cmd.go | 6 +- lxd/instance/drivers/load.go | 20 +- lxd/instance/drivers/qmp/commands.go | 4 +- lxd/instance/drivers/qmp/monitor.go | 2 +- lxd/instance/drivers/test_util.go | 4 +- lxd/instance/filter.go | 4 +- lxd/instance/instance_interface.go | 16 +- lxd/instance/instance_utils.go | 36 +- lxd/instance/instancetype/instance_type.go | 2 +- lxd/instance/operationlock/operationlock.go | 4 +- lxd/instance_backup.go | 22 +- lxd/instance_console.go | 22 +- lxd/instance_delete.go | 10 +- lxd/instance_exec.go | 26 +- lxd/instance_file.go | 6 +- lxd/instance_get.go | 4 +- lxd/instance_instance_types.go | 14 +- lxd/instance_logs.go | 14 +- lxd/instance_metadata.go | 16 +- lxd/instance_patch.go | 18 +- lxd/instance_post.go | 26 +- lxd/instance_put.go | 24 +- lxd/instance_snapshot.go | 26 +- lxd/instance_state.go | 12 +- lxd/instance_test.go | 20 +- lxd/instances.go | 16 +- lxd/instances_get.go | 24 +- lxd/instances_post.go | 32 +- lxd/ip/addr.go | 2 +- lxd/ip/class.go | 2 +- lxd/ip/filter.go | 2 +- lxd/ip/link.go | 2 +- lxd/ip/neigh.go | 4 +- lxd/ip/neigh_proxy.go | 4 +- lxd/ip/qdisc.go | 2 +- lxd/ip/route.go | 2 +- lxd/ip/tuntap.go | 2 +- lxd/lifecycle/certificate.go | 2 +- lxd/lifecycle/cluster.go | 2 +- lxd/lifecycle/cluster_member.go | 2 +- lxd/lifecycle/config.go | 2 +- lxd/lifecycle/image.go | 4 +- lxd/lifecycle/image_alias.go | 4 +- lxd/lifecycle/instance.go | 6 +- lxd/lifecycle/instance_backup.go | 6 +- lxd/lifecycle/instance_log.go | 4 +- lxd/lifecycle/instance_metadata.go | 4 +- lxd/lifecycle/instance_metadata_template.go | 4 +- lxd/lifecycle/instance_snapshot.go | 6 +- lxd/lifecycle/network.go | 4 +- lxd/lifecycle/operation.go | 2 +- lxd/lifecycle/profile.go | 4 +- lxd/lifecycle/project.go | 2 +- lxd/lifecycle/storage_pool.go | 4 +- lxd/lifecycle/storage_volume.go | 6 +- lxd/lifecycle/storage_volume_snapshot.go | 8 +- lxd/logging.go | 18 +- lxd/maas/controller.go | 2 +- lxd/main.go | 16 +- lxd/main_activateifneeded.go | 16 +- lxd/main_callhook.go | 2 +- lxd/main_checkfeature.go | 6 +- lxd/main_cluster.go | 18 +- lxd/main_daemon.go | 4 +- lxd/main_forkcoresched.go | 2 +- lxd/main_forkdns.go | 10 +- lxd/main_forkexec.go | 2 +- lxd/main_forkmount.go | 2 +- lxd/main_forknet.go | 6 +- lxd/main_forkproxy.go | 12 +- lxd/main_forkproxy_test.go | 4 +- lxd/main_forkstart.go | 2 +- lxd/main_forksyscall.go | 2 +- lxd/main_forkusernsexec.go | 2 +- lxd/main_forkzfs.go | 2 +- lxd/main_init.go | 10 +- lxd/main_init_auto.go | 10 +- lxd/main_init_dump.go | 4 +- lxd/main_init_interactive.go | 22 +- lxd/main_init_preseed.go | 2 +- lxd/main_manpage.go | 2 +- lxd/main_migratedumpsuccess.go | 4 +- lxd/main_netcat.go | 4 +- lxd/main_nsexec.go | 2 +- lxd/main_recover.go | 8 +- lxd/main_shutdown.go | 2 +- lxd/main_sql.go | 4 +- lxd/main_test.go | 8 +- lxd/main_version.go | 4 +- lxd/main_waitready.go | 4 +- lxd/migrate.go | 18 +- lxd/migrate_instance.go | 30 +- lxd/migrate_storage_volumes.go | 18 +- lxd/migration/migration_volumes.go | 8 +- lxd/migration/wsproto.go | 2 +- lxd/network/driver_bridge.go | 42 +-- lxd/network/driver_common.go | 24 +- lxd/network/network_interface.go | 12 +- lxd/network/network_load.go | 2 +- lxd/network/network_utils.go | 30 +- lxd/network/network_utils_bridge.go | 6 +- lxd/network/network_utils_sriov.go | 14 +- lxd/network/openvswitch/ovs.go | 2 +- lxd/networks.go | 36 +- lxd/networks_utils.go | 10 +- lxd/node/config.go | 10 +- lxd/node/config_test.go | 4 +- lxd/node/raft.go | 2 +- lxd/node/raft_test.go | 4 +- lxd/operations.go | 26 +- lxd/operations/linux.go | 2 +- lxd/operations/notlinux.go | 2 +- lxd/operations/operations.go | 20 +- lxd/operations/response.go | 12 +- lxd/operations/websocket.go | 4 +- lxd/patches.go | 36 +- lxd/patches_utils.go | 12 +- lxd/profiles.go | 28 +- lxd/profiles_utils.go | 14 +- lxd/project/permissions.go | 14 +- lxd/project/permissions_test.go | 8 +- lxd/project/project.go | 4 +- lxd/project/project_test.go | 2 +- lxd/rbac/requests.go | 4 +- lxd/rbac/server.go | 4 +- lxd/request/request.go | 2 +- lxd/resources.go | 8 +- lxd/resources/cpu.go | 2 +- lxd/resources/gpu.go | 2 +- lxd/resources/memory.go | 4 +- lxd/resources/network.go | 2 +- lxd/resources/network_ethtool.go | 2 +- lxd/resources/pci.go | 2 +- lxd/resources/resources.go | 2 +- lxd/resources/storage.go | 2 +- lxd/resources/system.go | 2 +- lxd/resources/usb.go | 4 +- lxd/response.go | 6 +- lxd/response/response.go | 10 +- lxd/response/smart.go | 4 +- lxd/revert/revert_test.go | 2 +- lxd/rsync/rsync.go | 8 +- lxd/seccomp/seccomp.go | 24 +- lxd/snapshot_common.go | 2 +- lxd/snapshot_common_test.go | 8 +- lxd/state/notlinux.go | 2 +- lxd/state/state.go | 18 +- lxd/state/testing.go | 6 +- lxd/storage.go | 20 +- lxd/storage/backend_lxd.go | 44 +-- lxd/storage/backend_lxd_patches.go | 16 +- lxd/storage/backend_mock.go | 22 +- lxd/storage/drivers/driver_btrfs.go | 16 +- lxd/storage/drivers/driver_btrfs_utils.go | 8 +- lxd/storage/drivers/driver_btrfs_volumes.go | 16 +- lxd/storage/drivers/driver_ceph.go | 14 +- lxd/storage/drivers/driver_ceph_utils.go | 10 +- lxd/storage/drivers/driver_ceph_volumes.go | 22 +- lxd/storage/drivers/driver_cephfs.go | 12 +- lxd/storage/drivers/driver_cephfs_utils.go | 2 +- lxd/storage/drivers/driver_cephfs_volumes.go | 18 +- lxd/storage/drivers/driver_common.go | 8 +- lxd/storage/drivers/driver_dir.go | 6 +- lxd/storage/drivers/driver_dir_utils.go | 6 +- lxd/storage/drivers/driver_dir_volumes.go | 18 +- lxd/storage/drivers/driver_lvm.go | 14 +- lxd/storage/drivers/driver_lvm_patches.go | 4 +- lxd/storage/drivers/driver_lvm_utils.go | 12 +- lxd/storage/drivers/driver_lvm_volumes.go | 18 +- lxd/storage/drivers/driver_mock.go | 12 +- lxd/storage/drivers/driver_zfs.go | 16 +- lxd/storage/drivers/driver_zfs_patches.go | 2 +- lxd/storage/drivers/driver_zfs_utils.go | 8 +- lxd/storage/drivers/driver_zfs_volumes.go | 22 +- lxd/storage/drivers/generic_vfs.go | 22 +- lxd/storage/drivers/interface.go | 16 +- lxd/storage/drivers/load.go | 4 +- lxd/storage/drivers/utils.go | 8 +- lxd/storage/drivers/utils_cgo.go | 2 +- lxd/storage/drivers/volume.go | 14 +- lxd/storage/filesystem/fs.go | 2 +- lxd/storage/load.go | 18 +- lxd/storage/pool_interface.go | 18 +- lxd/storage/quota/projectquota.go | 2 +- lxd/storage/storage.go | 6 +- lxd/storage/utils.go | 36 +- lxd/storage_migration.go | 10 +- lxd/storage_pools.go | 28 +- lxd/storage_pools_config.go | 8 +- lxd/storage_pools_utils.go | 16 +- lxd/storage_volumes.go | 26 +- lxd/storage_volumes_snapshot.go | 26 +- lxd/storage_volumes_utils.go | 16 +- lxd/swagger.go | 4 +- lxd/sys/apparmor.go | 6 +- lxd/sys/os.go | 12 +- lxd/task/group_test.go | 2 +- lxd/task/task_test.go | 2 +- lxd/ucred/ucred.go | 4 +- lxd/util/config.go | 2 +- lxd/util/config_test.go | 2 +- lxd/util/encryption.go | 2 +- lxd/util/http.go | 4 +- lxd/util/kernel.go | 2 +- lxd/util/net.go | 4 +- lxd/util/net_test.go | 4 +- lxd/util/storage.go | 6 +- lxd/util/sys.go | 6 +- lxd/vsock/vsock.go | 2 +- shared/archive_linux.go | 4 +- shared/cert_test.go | 2 +- shared/cmd/ask.go | 2 +- shared/eagain/file_unix.go | 2 +- shared/idmap/idmapset_linux.go | 4 +- shared/idmap/shift_linux.go | 6 +- shared/instance.go | 6 +- shared/instancewriter/instance_tar_writer.go | 6 +- shared/logging/log.go | 2 +- shared/netutils/network_linux.go | 4 +- shared/netutils/network_linux_cgo.go | 2 +- shared/network.go | 2 +- shared/simplestreams/products.go | 6 +- shared/simplestreams/simplestreams.go | 6 +- shared/simplestreams/sort.go | 4 +- shared/subprocess/proc.go | 2 +- shared/util.go | 6 +- shared/util_linux.go | 4 +- shared/util_linux_cgo.go | 2 +- shared/validate/validate.go | 4 +- shared/validate/validate_test.go | 2 +- shared/version/platform_linux.go | 4 +- shared/version/useragent.go | 2 +- test/godeps.list | 16 +- 578 files changed, 2589 insertions(+), 2589 deletions(-) diff --git a/.sphinx/_templates/header.html b/.sphinx/_templates/header.html index dea606bb2bd9..50f3aca7c953 100644 --- a/.sphinx/_templates/header.html +++ b/.sphinx/_templates/header.html @@ -115,7 +115,7 @@
  • - GitHub + GitHub
    • diff --git a/.sphinx/conf.py b/.sphinx/conf.py index 16d8d1846572..26c856318105 100644 --- a/.sphinx/conf.py +++ b/.sphinx/conf.py @@ -98,7 +98,7 @@ } html_context = { - "github_url": "https://github.com/lxc/lxd", + "github_url": "https://github.com/canonical/lxd", "github_version": "master", "github_folder": "/doc/", "github_filetype": "md" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b8bd570f7f27..c797fb671465 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Check the following guidelines before contributing to the project. ## Pull requests Changes to this project should be proposed as pull requests on Github -at: +at: Proposed changes will then go through code review there and once acked, be merged in the main branch. @@ -98,7 +98,7 @@ even when part of a larger set. You may find `git commit -s` useful. ## Code of Conduct -When contributing, you must adhere to the Code of Conduct, which is available at: https://github.com/lxc/lxd/blob/master/CODE_OF_CONDUCT.md +When contributing, you must adhere to the Code of Conduct, which is available at: https://github.com/canonical/lxd/blob/master/CODE_OF_CONDUCT.md diff --git a/README.md b/README.md index 5cd6a1702d87..6c9e3a1a412d 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ Then if you want to run it locally, take a look at our [getting started guide](h ## Status Type | Service | Status --- | --- | --- -CI (client) | GitHub | [![Build Status](https://github.com/lxc/lxd/workflows/Client%20build%20and%20unit%20tests/badge.svg?branch=stable-4.0)](https://github.com/lxc/lxd/actions) +CI (client) | GitHub | [![Build Status](https://github.com/canonical/lxd/workflows/Client%20build%20and%20unit%20tests/badge.svg?branch=stable-4.0)](https://github.com/canonical/lxd/actions) CI (server) | Jenkins | [![Build Status](https://jenkins.linuxcontainers.org/job/lxd-github-commit/badge/icon)](https://jenkins.linuxcontainers.org/job/lxd-github-commit/) -Go documentation | Godoc | [![GoDoc](https://godoc.org/github.com/lxc/lxd/client?status.svg)](https://godoc.org/github.com/lxc/lxd/client) -Static analysis | GoReport | [![Go Report Card](https://goreportcard.com/badge/github.com/lxc/lxd)](https://goreportcard.com/report/github.com/lxc/lxd) +Go documentation | Godoc | [![GoDoc](https://godoc.org/github.com/canonical/lxd/client?status.svg)](https://godoc.org/github.com/canonical/lxd/client) +Static analysis | GoReport | [![Go Report Card](https://goreportcard.com/badge/github.com/canonical/lxd)](https://goreportcard.com/report/github.com/canonical/lxd) Translations | Weblate | [![Translation status](https://hosted.weblate.org/widgets/linux-containers/-/svg-badge.svg)](https://hosted.weblate.org/projects/linux-containers/lxd/) Project status | CII Best Practices | [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1086/badge)](https://bestpractices.coreinfrastructure.org/projects/1086) @@ -70,7 +70,7 @@ Therefore, you should only give such access to users who you'd trust with root a The following channels are available for you to interact with the LXD community. ### Bug reports -You can file bug reports and feature requests at: https://github.com/lxc/lxd/issues/new +You can file bug reports and feature requests at: https://github.com/canonical/lxd/issues/new ### Forum A discussion forum is available at: https://discuss.linuxcontainers.org diff --git a/client/connection.go b/client/connection.go index ff5b0a283c15..145cc10a4b19 100644 --- a/client/connection.go +++ b/client/connection.go @@ -15,9 +15,9 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/macaroon-bakery.v2/httpbakery" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/simplestreams" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/simplestreams" ) // ConnectionArgs represents a set of common connection properties diff --git a/client/events.go b/client/events.go index 3ccdf6d8a27c..33466e8aeeb5 100644 --- a/client/events.go +++ b/client/events.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // The EventListener struct is used to interact with a LXD event stream diff --git a/client/interfaces.go b/client/interfaces.go index 54d1a511485e..20da099409c6 100644 --- a/client/interfaces.go +++ b/client/interfaces.go @@ -6,9 +6,9 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" ) // The Operation type represents a currently running operation. diff --git a/client/lxd.go b/client/lxd.go index c3e045795284..f3d60be5ea8f 100644 --- a/client/lxd.go +++ b/client/lxd.go @@ -14,9 +14,9 @@ import ( "gopkg.in/macaroon-bakery.v2/bakery" "gopkg.in/macaroon-bakery.v2/httpbakery" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" neturl "net/url" ) diff --git a/client/lxd_certificates.go b/client/lxd_certificates.go index cdf229e4659b..62cd2158c563 100644 --- a/client/lxd_certificates.go +++ b/client/lxd_certificates.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Certificate handling functions diff --git a/client/lxd_cluster.go b/client/lxd_cluster.go index bc6e70bebc4c..d9106798f620 100644 --- a/client/lxd_cluster.go +++ b/client/lxd_cluster.go @@ -3,7 +3,7 @@ package lxd import ( "fmt" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetCluster returns information about a cluster diff --git a/client/lxd_containers.go b/client/lxd_containers.go index 279ee06190d9..a8407ab6cd6c 100644 --- a/client/lxd_containers.go +++ b/client/lxd_containers.go @@ -10,11 +10,11 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // Container handling functions diff --git a/client/lxd_events.go b/client/lxd_events.go index d9ac706f0a7a..31d2c366ea6b 100644 --- a/client/lxd_events.go +++ b/client/lxd_events.go @@ -7,8 +7,8 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Event handling functions diff --git a/client/lxd_images.go b/client/lxd_images.go index 9e46d77462f8..e694d3b20b47 100644 --- a/client/lxd_images.go +++ b/client/lxd_images.go @@ -12,11 +12,11 @@ import ( "os" "strings" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // Image handling functions diff --git a/client/lxd_instances.go b/client/lxd_instances.go index 3bbbe3958c79..faaded1ffe1d 100644 --- a/client/lxd_instances.go +++ b/client/lxd_instances.go @@ -10,11 +10,11 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // Instance handling functions. diff --git a/client/lxd_network_acls.go b/client/lxd_network_acls.go index 9d9a1285b7aa..e0cc0c45a88a 100644 --- a/client/lxd_network_acls.go +++ b/client/lxd_network_acls.go @@ -6,7 +6,7 @@ import ( "net/http" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkACLNames returns a list of network ACL names. diff --git a/client/lxd_network_forwards.go b/client/lxd_network_forwards.go index 22f1f8fce459..5efa7098885a 100644 --- a/client/lxd_network_forwards.go +++ b/client/lxd_network_forwards.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkForwardAddresses returns a list of network forward listen addresses. diff --git a/client/lxd_network_peer.go b/client/lxd_network_peer.go index 804236834b3f..386bab464c3f 100644 --- a/client/lxd_network_peer.go +++ b/client/lxd_network_peer.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkPeerNames returns a list of network peer names. diff --git a/client/lxd_network_zones.go b/client/lxd_network_zones.go index 50a62b2d5da7..708ea046b05c 100644 --- a/client/lxd_network_zones.go +++ b/client/lxd_network_zones.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkZoneNames returns a list of network zone names. diff --git a/client/lxd_networks.go b/client/lxd_networks.go index 193eef8c8bfb..0961cb6098b4 100644 --- a/client/lxd_networks.go +++ b/client/lxd_networks.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetNetworkNames returns a list of network names diff --git a/client/lxd_operations.go b/client/lxd_operations.go index 62c810837af4..a0ad065853fb 100644 --- a/client/lxd_operations.go +++ b/client/lxd_operations.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetOperationUUIDs returns a list of operation uuids diff --git a/client/lxd_profiles.go b/client/lxd_profiles.go index 4d9efcc05a27..270fdfe388dc 100644 --- a/client/lxd_profiles.go +++ b/client/lxd_profiles.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Profile handling functions diff --git a/client/lxd_projects.go b/client/lxd_projects.go index e9a499bc889d..b2a7d248e3b5 100644 --- a/client/lxd_projects.go +++ b/client/lxd_projects.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Project handling functions diff --git a/client/lxd_server.go b/client/lxd_server.go index 13f20a7cf514..731afd55a77e 100644 --- a/client/lxd_server.go +++ b/client/lxd_server.go @@ -5,8 +5,8 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Server handling functions diff --git a/client/lxd_storage_pools.go b/client/lxd_storage_pools.go index 4bc5cd4ade53..ddad3c20216f 100644 --- a/client/lxd_storage_pools.go +++ b/client/lxd_storage_pools.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Storage pool handling functions diff --git a/client/lxd_storage_volumes.go b/client/lxd_storage_volumes.go index d6e874bf51fe..932b3e846413 100644 --- a/client/lxd_storage_volumes.go +++ b/client/lxd_storage_volumes.go @@ -6,11 +6,11 @@ import ( "net/http" "net/url" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // Storage volumes handling function diff --git a/client/lxd_warnings.go b/client/lxd_warnings.go index 93bfe8b98527..052bb5cf2da1 100644 --- a/client/lxd_warnings.go +++ b/client/lxd_warnings.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Warning handling functions diff --git a/client/operations.go b/client/operations.go index c7d7dbca6795..46ef572c089e 100644 --- a/client/operations.go +++ b/client/operations.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // The Operation type represents an ongoing LXD operation (asynchronous processing) diff --git a/client/simplestreams.go b/client/simplestreams.go index 015389e15e27..74159b1b4fa6 100644 --- a/client/simplestreams.go +++ b/client/simplestreams.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/lxc/lxd/shared/simplestreams" + "github.com/canonical/lxd/shared/simplestreams" ) // ProtocolSimpleStreams implements a SimpleStreams API client diff --git a/client/simplestreams_images.go b/client/simplestreams_images.go index 0cd506d9528e..a370e4d656a7 100644 --- a/client/simplestreams_images.go +++ b/client/simplestreams_images.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Image handling functions diff --git a/client/util.go b/client/util.go index 46a28970234b..50f1febf8da5 100644 --- a/client/util.go +++ b/client/util.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) func tlsHTTPClient(client *http.Client, tlsClientCert string, tlsClientKey string, tlsCA string, tlsServerCert string, insecureSkipVerify bool, proxy func(req *http.Request) (*url.URL, error)) (*http.Client, error) { diff --git a/doc/database.md b/doc/database.md index 3b4212dd4a66..2c288d47a4d8 100644 --- a/doc/database.md +++ b/doc/database.md @@ -56,7 +56,7 @@ against the local or global database, you can use the ``lxd sql`` command (run You should only need to do that in order to recover from broken updates or bugs. Please consult the LXD team first (creating a [GitHub -issue](https://github.com/lxc/lxd/issues/new) or +issue](https://github.com/canonical/lxd/issues/new) or [forum](https://discuss.linuxcontainers.org/) post). ## Running custom queries at LXD daemon startup diff --git a/doc/external_resources.md b/doc/external_resources.md index a80451e27c88..f40e2fa76d5a 100644 --- a/doc/external_resources.md +++ b/doc/external_resources.md @@ -3,6 +3,6 @@ ```{toctree} :maxdepth: 1 -Project repository +Project repository Image server ``` diff --git a/doc/installing.md b/doc/installing.md index a9e893f337e7..4b9c628ee820 100644 --- a/doc/installing.md +++ b/doc/installing.md @@ -42,7 +42,7 @@ integration into Linux distributions are not covered here and may be covered in future. ```bash -git clone https://github.com/lxc/lxd +git clone https://github.com/canonical/lxd cd lxd ``` diff --git a/doc/metadata.yaml b/doc/metadata.yaml index e6e51f280661..127f6872c745 100644 --- a/doc/metadata.yaml +++ b/doc/metadata.yaml @@ -114,7 +114,7 @@ navigation: - title: External resources children: - title: Project repository - location: https://github.com/lxc/lxd + location: https://github.com/canonical/lxd external: true - title: Image server diff --git a/doc/rest-api.md b/doc/rest-api.md index ab50c85f52c1..3f742afac5ed 100644 --- a/doc/rest-api.md +++ b/doc/rest-api.md @@ -225,5 +225,5 @@ much like `/1.0/containers` will only show you instances of that type. ## API structure LXD has an auto-generated [Swagger](https://swagger.io/) specification describing its API endpoints. -The YAML version of this API specification can be found in [rest-api.yaml](https://github.com/lxc/lxd/blob/stable-4.0/doc/rest-api.yaml). +The YAML version of this API specification can be found in [rest-api.yaml](https://github.com/canonical/lxd/blob/stable-4.0/doc/rest-api.yaml). A convenient web rendering of it can be found here: [https://linuxcontainers.org/lxd/api/stable-4.0/](https://linuxcontainers.org/lxd/api/stable-4.0/) diff --git a/doc/rest-api.yaml b/doc/rest-api.yaml index c0b324190429..fb6d118a4796 100644 --- a/doc/rest-api.yaml +++ b/doc/rest-api.yaml @@ -39,7 +39,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api CertificatePut: description: CertificatePut represents the modifiable fields of a LXD certificate properties: @@ -74,7 +74,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api CertificatesPost: description: CertificatesPost represents the fields of a new LXD certificate properties: @@ -114,7 +114,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Cluster: properties: enabled: @@ -136,7 +136,7 @@ definitions: x-go-name: ServerName title: Cluster represents high-level information about a LXD cluster. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterCertificatePut: description: ClusterCertificatePut represents the certificate and key pair for all members in a LXD Cluster @@ -152,7 +152,7 @@ definitions: type: string x-go-name: ClusterCertificateKey type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterGroup: properties: description: @@ -176,7 +176,7 @@ definitions: x-go-name: Name title: ClusterGroup represents a cluster group. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterGroupPost: properties: name: @@ -186,7 +186,7 @@ definitions: x-go-name: Name title: ClusterGroupPost represents the fields required to rename a cluster group. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterGroupPut: properties: description: @@ -205,7 +205,7 @@ definitions: x-go-name: Members title: ClusterGroupPut represents the modifiable fields of a cluster group. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterGroupsPost: properties: description: @@ -229,7 +229,7 @@ definitions: x-go-name: Name title: ClusterGroupsPost represents the fields available for a new cluster group. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMember: properties: architecture: @@ -299,7 +299,7 @@ definitions: x-go-name: URL title: ClusterMember represents the a LXD node in the cluster. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberConfigKey: description: |- The Value field is empty when getting clustering information with GET @@ -335,7 +335,7 @@ definitions: ClusterMemberConfigKey represents a single config key that a new member of the cluster is required to provide when joining. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberJoinToken: properties: addresses: @@ -364,7 +364,7 @@ definitions: title: ClusterMemberJoinToken represents the fields contained within an encoded cluster member join token. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberPost: properties: server_name: @@ -374,7 +374,7 @@ definitions: x-go-name: ServerName title: ClusterMemberPost represents the fields required to rename a LXD node. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberPut: description: ClusterMemberPut represents the the modifiable fields of a LXD cluster member @@ -415,7 +415,7 @@ definitions: type: array x-go-name: Roles type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMemberStatePost: properties: action: @@ -427,7 +427,7 @@ definitions: title: ClusterMemberStatePost represents the fields required to evacuate a cluster member. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterMembersPost: properties: server_name: @@ -438,7 +438,7 @@ definitions: title: ClusterMembersPost represents the fields required to request a join token to add a member to the cluster. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ClusterPut: description: |- ClusterPut represents the fields required to bootstrap or join a LXD @@ -482,7 +482,7 @@ definitions: type: string x-go-name: ServerName type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Event: description: Event represents an event entry (over websocket) properties: @@ -516,7 +516,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Image: description: Image represents a LXD image properties: @@ -613,7 +613,7 @@ definitions: type: string x-go-name: UploadedAt type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAlias: description: ImageAlias represents an alias from the alias list of a LXD image properties: @@ -628,7 +628,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAliasesEntry: description: ImageAliasesEntry represents a LXD image alias properties: @@ -653,7 +653,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAliasesEntryPost: description: ImageAliasesEntryPost represents the required fields to rename a LXD image alias @@ -664,7 +664,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAliasesEntryPut: description: ImageAliasesEntryPut represents the modifiable fields of a LXD image alias @@ -680,7 +680,7 @@ definitions: type: string x-go-name: Target type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageAliasesPost: description: ImageAliasesPost represents a new LXD image alias properties: @@ -705,7 +705,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageExportPost: description: ImageExportPost represents the fields required to export a LXD image properties: @@ -731,7 +731,7 @@ definitions: type: string x-go-name: Target type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageMetadata: description: ImageMetadata represents LXD image metadata (used in image tarball) properties: @@ -769,7 +769,7 @@ definitions: type: object x-go-name: Templates type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageMetadataTemplate: description: ImageMetadataTemplate represents a template entry in image metadata (used in image tarball) @@ -800,7 +800,7 @@ definitions: type: array x-go-name: When type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImagePut: description: ImagePut represents the modifiable fields of a LXD image properties: @@ -840,7 +840,7 @@ definitions: type: boolean x-go-name: Public type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImageSource: description: ImageSource represents the source of a LXD image properties: @@ -870,7 +870,7 @@ definitions: type: string x-go-name: Server type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImagesPost: description: ImagesPost represents the fields available for a new LXD image properties: @@ -931,7 +931,7 @@ definitions: source: $ref: '#/definitions/ImagesPostSource' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ImagesPostSource: description: ImagesPostSource represents the source of a new LXD image properties: @@ -996,7 +996,7 @@ definitions: type: string x-go-name: URL type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Instance: properties: architecture: @@ -1115,7 +1115,7 @@ definitions: x-go-name: Type title: Instance represents a LXD instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceBackup: properties: container_only: @@ -1153,7 +1153,7 @@ definitions: x-go-name: OptimizedStorage title: InstanceBackup represents a LXD instance backup. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceBackupPost: properties: name: @@ -1164,7 +1164,7 @@ definitions: title: InstanceBackupPost represents the fields available for the renaming of a instance backup. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceBackupsPost: properties: compression_algorithm: @@ -1202,7 +1202,7 @@ definitions: title: InstanceBackupsPost represents the fields available for a new LXD instance backup. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceConsolePost: properties: height: @@ -1224,7 +1224,7 @@ definitions: x-go-name: Width title: InstanceConsolePost represents a LXD instance console request. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceExecPost: properties: command: @@ -1290,7 +1290,7 @@ definitions: x-go-name: Width title: InstanceExecPost represents a LXD instance exec request. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceFull: properties: architecture: @@ -1424,7 +1424,7 @@ definitions: title: InstanceFull is a combination of Instance, InstanceBackup, InstanceState and InstanceSnapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancePost: properties: container_only: @@ -1467,7 +1467,7 @@ definitions: $ref: '#/definitions/InstancePostTarget' title: InstancePost represents the fields required to rename/move a LXD instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancePostTarget: properties: certificate: @@ -1491,7 +1491,7 @@ definitions: x-go-name: Websockets title: InstancePostTarget represents the migration target host and operation. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancePut: properties: architecture: @@ -1550,7 +1550,7 @@ definitions: x-go-name: Stateful title: InstancePut represents the modifiable fields of a LXD instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSnapshot: properties: architecture: @@ -1649,7 +1649,7 @@ definitions: x-go-name: Stateful title: InstanceSnapshot represents a LXD instance snapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSnapshotPost: properties: live: @@ -1672,7 +1672,7 @@ definitions: title: InstanceSnapshotPost represents the fields required to rename/move a LXD instance snapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSnapshotPut: properties: expires_at: @@ -1684,7 +1684,7 @@ definitions: title: InstanceSnapshotPut represents the modifiable fields of a LXD instance snapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSnapshotsPost: properties: expires_at: @@ -1706,7 +1706,7 @@ definitions: title: InstanceSnapshotsPost represents the fields available for a new LXD instance snapshot. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceSource: properties: alias: @@ -1817,7 +1817,7 @@ definitions: x-go-name: Type title: InstanceSource represents the creation source for a new instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceState: properties: cpu: @@ -1857,7 +1857,7 @@ definitions: $ref: '#/definitions/StatusCode' title: InstanceState represents a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateCPU: properties: usage: @@ -1869,7 +1869,7 @@ definitions: title: InstanceStateCPU represents the cpu information section of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateDisk: properties: usage: @@ -1881,7 +1881,7 @@ definitions: title: InstanceStateDisk represents the disk information section of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateMemory: properties: swap_usage: @@ -1911,7 +1911,7 @@ definitions: title: InstanceStateMemory represents the memory information section of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateNetwork: properties: addresses: @@ -1951,7 +1951,7 @@ definitions: title: InstanceStateNetwork represents the network information section of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateNetworkAddress: description: |- InstanceStateNetworkAddress represents a network address as part of the network section of a LXD @@ -1978,7 +1978,7 @@ definitions: type: string x-go-name: Scope type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStateNetworkCounters: description: |- InstanceStateNetworkCounters represents packet counters as part of the network section of a LXD @@ -2033,7 +2033,7 @@ definitions: type: integer x-go-name: PacketsSent type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceStatePut: properties: action: @@ -2059,12 +2059,12 @@ definitions: x-go-name: Timeout title: InstanceStatePut represents the modifiable fields of a LXD instance's state. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstanceType: title: InstanceType represents the type if instance being returned or requested via the API. type: string - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancesPost: properties: architecture: @@ -2137,14 +2137,14 @@ definitions: $ref: '#/definitions/InstanceType' title: InstancesPost represents the fields available for a new LXD instance. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api InstancesPut: properties: state: $ref: '#/definitions/InstanceStatePut' title: InstancesPut represents the fields available for a mass update. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Network: description: Network represents a LXD network properties: @@ -2209,7 +2209,7 @@ definitions: type: array x-go-name: UsedBy type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACL: properties: config: @@ -2255,7 +2255,7 @@ definitions: x-go-name: UsedBy title: NetworkACL used for displaying an ACL. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACLPost: properties: name: @@ -2265,7 +2265,7 @@ definitions: x-go-name: Name title: NetworkACLPost used for renaming an ACL. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACLPut: properties: config: @@ -2295,7 +2295,7 @@ definitions: x-go-name: Ingress title: NetworkACLPut used for updating an ACL. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACLRule: description: Refer to doc/network-acls.md for details. properties: @@ -2351,7 +2351,7 @@ definitions: x-go-name: State title: NetworkACLRule represents a single rule in an ACL ruleset. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkACLsPost: properties: config: @@ -2386,7 +2386,7 @@ definitions: x-go-name: Name title: NetworkACLsPost used for creating an ACL. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkForward: properties: config: @@ -2420,7 +2420,7 @@ definitions: x-go-name: Ports title: NetworkForward used for displaying an network address forward. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkForwardPort: description: NetworkForwardPort represents a port specification in a network address forward @@ -2451,7 +2451,7 @@ definitions: type: string x-go-name: TargetPort type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkForwardPut: description: NetworkForwardPut represents the modifiable fields of a LXD network address forward @@ -2476,7 +2476,7 @@ definitions: type: array x-go-name: Ports type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkForwardsPost: description: NetworkForwardsPost represents the fields of a new LXD network address forward @@ -2506,7 +2506,7 @@ definitions: type: array x-go-name: Ports type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkLease: description: NetworkLease represents a DHCP lease properties: @@ -2536,7 +2536,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPeer: properties: config: @@ -2588,7 +2588,7 @@ definitions: x-go-name: UsedBy title: NetworkPeer used for displaying a LXD network peering. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPeerPut: description: NetworkPeerPut represents the modifiable fields of a LXD network peering @@ -2607,7 +2607,7 @@ definitions: type: string x-go-name: Description type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPeersPost: description: NetworkPeersPost represents the fields of a new LXD network peering properties: @@ -2640,7 +2640,7 @@ definitions: type: string x-go-name: TargetProject type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPost: description: NetworkPost represents the fields required to rename a LXD network properties: @@ -2650,7 +2650,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkPut: description: NetworkPut represents the modifiable fields of a LXD network properties: @@ -2670,7 +2670,7 @@ definitions: type: string x-go-name: Description type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkState: description: NetworkState represents the network state properties: @@ -2712,7 +2712,7 @@ definitions: vlan: $ref: '#/definitions/NetworkStateVLAN' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateAddress: description: NetworkStateAddress represents a network address properties: @@ -2737,7 +2737,7 @@ definitions: type: string x-go-name: Scope type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateBond: description: NetworkStateBond represents bond specific state properties: @@ -2784,7 +2784,7 @@ definitions: type: integer x-go-name: UpDelay type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateBridge: description: NetworkStateBridge represents bridge specific state properties: @@ -2825,7 +2825,7 @@ definitions: type: boolean x-go-name: VLANFiltering type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateCounters: description: NetworkStateCounters represents packet counters properties: @@ -2854,7 +2854,7 @@ definitions: type: integer x-go-name: PacketsSent type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateOVN: description: NetworkStateOVN represents OVN specific state properties: @@ -2863,7 +2863,7 @@ definitions: type: string x-go-name: Chassis type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkStateVLAN: description: NetworkStateVLAN represents VLAN specific state properties: @@ -2879,7 +2879,7 @@ definitions: type: integer x-go-name: VID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZone: properties: config: @@ -2912,7 +2912,7 @@ definitions: x-go-name: UsedBy title: NetworkZone represents a network zone (DNS). type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZonePut: description: NetworkZonePut represents the modifiable fields of a LXD network zone @@ -2931,7 +2931,7 @@ definitions: type: string x-go-name: Description type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZoneRecord: properties: config: @@ -2960,7 +2960,7 @@ definitions: x-go-name: Name title: NetworkZoneRecord represents a network zone (DNS) record. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZoneRecordEntry: description: NetworkZoneRecordEntry represents the fields in a record entry properties: @@ -2981,7 +2981,7 @@ definitions: type: string x-go-name: Value type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZoneRecordPut: description: NetworkZoneRecordPut represents the modifiable fields of a LXD network zone record @@ -3006,7 +3006,7 @@ definitions: type: array x-go-name: Entries type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZoneRecordsPost: description: NetworkZoneRecordsPost represents the fields of a new LXD network zone record @@ -3036,7 +3036,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworkZonesPost: description: NetworkZonesPost represents the fields of a new LXD network zone properties: @@ -3059,7 +3059,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api NetworksPost: description: NetworksPost represents the fields of a new LXD network properties: @@ -3089,7 +3089,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Operation: description: Operation represents a LXD background operation properties: @@ -3175,7 +3175,7 @@ definitions: type: string x-go-name: UpdatedAt type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Profile: description: Profile represents a LXD profile properties: @@ -3227,7 +3227,7 @@ definitions: type: array x-go-name: UsedBy type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProfilePost: description: ProfilePost represents the fields required to rename a LXD profile properties: @@ -3237,7 +3237,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProfilePut: description: ProfilePut represents the modifiable fields of a LXD profile properties: @@ -3273,7 +3273,7 @@ definitions: type: object x-go-name: Devices type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProfilesPost: description: ProfilesPost represents the fields of a new LXD profile properties: @@ -3314,7 +3314,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Project: description: Project represents a LXD project properties: @@ -3352,7 +3352,7 @@ definitions: type: array x-go-name: UsedBy type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectPost: description: ProjectPost represents the fields required to rename a LXD project properties: @@ -3362,7 +3362,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectPut: description: ProjectPut represents the modifiable fields of a LXD project properties: @@ -3381,7 +3381,7 @@ definitions: type: string x-go-name: Description type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectState: description: ProjectState represents the current running state of a LXD project properties: @@ -3400,7 +3400,7 @@ definitions: type: object x-go-name: Resources type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectStateResource: description: ProjectStateResource represents the state of a particular resource in a LXD project @@ -3416,7 +3416,7 @@ definitions: format: int64 type: integer type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ProjectsPost: description: ProjectsPost represents the fields of a new LXD project properties: @@ -3440,7 +3440,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Resources: description: Resources represents the system resources available for LXD properties: @@ -3461,7 +3461,7 @@ definitions: usb: $ref: '#/definitions/ResourcesUSB' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPU: description: ResourcesCPU represents the cpu resources available on the system properties: @@ -3483,7 +3483,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPUCache: description: ResourcesCPUCache represents a CPU cache properties: @@ -3505,7 +3505,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPUCore: description: ResourcesCPUCore represents a CPU core on the system properties: @@ -3534,7 +3534,7 @@ definitions: type: array x-go-name: Threads type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPUSocket: description: ResourcesCPUSocket represents a CPU socket on the system properties: @@ -3585,7 +3585,7 @@ definitions: type: string x-go-name: Vendor type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesCPUThread: description: ResourcesCPUThread represents a CPU thread on the system properties: @@ -3618,7 +3618,7 @@ definitions: type: integer x-go-name: Thread type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPU: description: ResourcesGPU represents the GPU resources available on the system properties: @@ -3635,7 +3635,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCard: description: ResourcesGPUCard represents a GPU card on the system properties: @@ -3699,7 +3699,7 @@ definitions: type: string x-go-name: VendorID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCardDRM: description: ResourcesGPUCardDRM represents the Linux DRM configuration of the GPU @@ -3741,7 +3741,7 @@ definitions: type: string x-go-name: RenderName type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCardMdev: description: ResourcesGPUCardMdev represents the mediated devices configuration of the GPU @@ -3778,7 +3778,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCardNvidia: description: ResourcesGPUCardNvidia represents additional information for NVIDIA GPUs @@ -3824,7 +3824,7 @@ definitions: type: string x-go-name: UUID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesGPUCardSRIOV: description: ResourcesGPUCardSRIOV represents the SRIOV configuration of the GPU properties: @@ -3848,7 +3848,7 @@ definitions: type: array x-go-name: VFs type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesMemory: description: ResourcesMemory represents the memory resources available on the system @@ -3891,7 +3891,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesMemoryNode: description: ResourcesMemoryNode represents the node-specific memory resources available on the system @@ -3927,7 +3927,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetwork: description: ResourcesNetwork represents the network cards available on the system properties: @@ -3944,7 +3944,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetworkCard: description: ResourcesNetworkCard represents a network card on the system properties: @@ -4008,7 +4008,7 @@ definitions: type: string x-go-name: VendorID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetworkCardPort: description: ResourcesNetworkCardPort represents a network port on the system properties: @@ -4087,7 +4087,7 @@ definitions: type: string x-go-name: TransceiverType type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetworkCardPortInfiniband: description: ResourcesNetworkCardPortInfiniband represents the Linux Infiniband configuration for the port @@ -4123,7 +4123,7 @@ definitions: type: string x-go-name: VerbName type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesNetworkCardSRIOV: description: ResourcesNetworkCardSRIOV represents the SRIOV configuration of the network card @@ -4148,7 +4148,7 @@ definitions: type: array x-go-name: VFs type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesPCI: description: ResourcesPCI represents the PCI devices available on the system properties: @@ -4165,7 +4165,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesPCIDevice: description: ResourcesPCIDevice represents a PCI device properties: @@ -4217,7 +4217,7 @@ definitions: type: string x-go-name: VendorID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStorage: description: ResourcesStorage represents the local storage properties: @@ -4234,7 +4234,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStorageDisk: description: ResourcesStorageDisk represents a disk properties: @@ -4334,7 +4334,7 @@ definitions: type: string x-go-name: WWN type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStorageDiskPartition: description: ResourcesStorageDiskPartition represents a partition on a disk properties: @@ -4366,7 +4366,7 @@ definitions: type: integer x-go-name: Size type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStoragePool: description: ResourcesStoragePool represents the resources available to a given storage pool @@ -4376,7 +4376,7 @@ definitions: space: $ref: '#/definitions/ResourcesStoragePoolSpace' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStoragePoolInodes: description: ResourcesStoragePoolInodes represents the inodes available to a given storage pool @@ -4394,7 +4394,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesStoragePoolSpace: description: ResourcesStoragePoolSpace represents the space available to a given storage pool @@ -4412,7 +4412,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesSystem: description: ResourcesSystem represents the system properties: @@ -4464,7 +4464,7 @@ definitions: type: string x-go-name: Version type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesSystemChassis: description: ResourcesSystemChassis represents the system chassis properties: @@ -4489,7 +4489,7 @@ definitions: type: string x-go-name: Version type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesSystemFirmware: description: ResourcesSystemFirmware represents the system firmware properties: @@ -4509,7 +4509,7 @@ definitions: type: string x-go-name: Version type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesSystemMotherboard: description: ResourcesSystemMotherboard represents the motherboard properties: @@ -4534,7 +4534,7 @@ definitions: type: string x-go-name: Version type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesUSB: description: ResourcesUSB represents the USB devices available on the system properties: @@ -4551,7 +4551,7 @@ definitions: type: integer x-go-name: Total type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesUSBDevice: description: ResourcesUSBDevice represents a USB device properties: @@ -4600,7 +4600,7 @@ definitions: type: string x-go-name: VendorID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ResourcesUSBDeviceInterface: description: ResourcesUSBDeviceInterface represents a USB device interface properties: @@ -4643,7 +4643,7 @@ definitions: type: integer x-go-name: SubClassID type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Server: description: Server represents a LXD server properties: @@ -4707,7 +4707,7 @@ definitions: type: boolean x-go-name: Public type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ServerEnvironment: description: ServerEnvironment represents the read-only environment fields of a LXD server @@ -4846,7 +4846,7 @@ definitions: type: string x-go-name: StorageVersion type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ServerPut: description: ServerPut represents the modifiable fields of a LXD server configuration properties: @@ -4860,7 +4860,7 @@ definitions: type: object x-go-name: Config type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ServerStorageDriverInfo: description: ServerStorageDriverInfo represents the read-only info about a storage driver @@ -4878,7 +4878,7 @@ definitions: example: 0.8.4-1ubuntu11 type: string type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api ServerUntrusted: description: ServerUntrusted represents a LXD server for an untrusted client properties: @@ -4931,12 +4931,12 @@ definitions: type: boolean x-go-name: Public type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StatusCode: description: StatusCode represents a valid LXD operation and container status format: int64 type: integer - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePool: properties: config: @@ -4991,7 +4991,7 @@ definitions: x-go-name: UsedBy title: StoragePool represents the fields of a LXD storage pool. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolPut: properties: config: @@ -5010,7 +5010,7 @@ definitions: x-go-name: Description title: StoragePoolPut represents the modifiable fields of a LXD storage pool. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolVolumeBackup: description: StoragePoolVolumeBackup represents a LXD volume backup properties: @@ -5043,7 +5043,7 @@ definitions: type: boolean x-go-name: VolumeOnly type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolVolumeBackupPost: description: StoragePoolVolumeBackupPost represents the fields available for the renaming of a volume backup @@ -5054,7 +5054,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolVolumeBackupsPost: description: StoragePoolVolumeBackupsPost represents the fields available for a new LXD volume backup @@ -5087,7 +5087,7 @@ definitions: type: boolean x-go-name: VolumeOnly type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StoragePoolsPost: description: StoragePoolsPost represents the fields of a new LXD storage pool properties: @@ -5116,7 +5116,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolume: properties: config: @@ -5168,7 +5168,7 @@ definitions: x-go-name: UsedBy title: StorageVolume represents the fields of a LXD storage volume. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumePost: description: StorageVolumePost represents the fields required to rename a LXD storage pool volume @@ -5201,7 +5201,7 @@ definitions: type: boolean x-go-name: VolumeOnly type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumePostTarget: description: StorageVolumePostTarget represents the migration target host and operation @@ -5225,7 +5225,7 @@ definitions: type: object x-go-name: Websockets type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumePut: description: StorageVolumePut represents the modifiable fields of a LXD storage volume @@ -5250,7 +5250,7 @@ definitions: type: string x-go-name: Restore type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSnapshot: description: StorageVolumeSnapshot represents a LXD storage volume snapshot properties: @@ -5285,7 +5285,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSnapshotPost: description: StorageVolumeSnapshotPost represents the fields required to rename/move a LXD storage volume snapshot @@ -5296,7 +5296,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSnapshotPut: description: StorageVolumeSnapshotPut represents the modifiable fields of a LXD storage volume @@ -5313,7 +5313,7 @@ definitions: type: string x-go-name: ExpiresAt type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSnapshotsPost: description: StorageVolumeSnapshotsPost represents the fields available for a new LXD storage volume snapshot @@ -5330,7 +5330,7 @@ definitions: type: string x-go-name: Name type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeSource: description: StorageVolumeSource represents the creation source for a new storage volume @@ -5389,14 +5389,14 @@ definitions: type: boolean x-go-name: VolumeOnly type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeState: description: StorageVolumeState represents the live state of the volume properties: usage: $ref: '#/definitions/StorageVolumeStateUsage' type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumeStateUsage: description: StorageVolumeStateUsage represents the disk usage of a volume properties: @@ -5407,7 +5407,7 @@ definitions: type: integer x-go-name: Used type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api StorageVolumesPost: description: StorageVolumesPost represents the fields of a new LXD storage pool volume @@ -5449,7 +5449,7 @@ definitions: type: string x-go-name: Type type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api Warning: properties: count: @@ -5512,7 +5512,7 @@ definitions: x-go-name: UUID title: Warning represents a warning entry. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api WarningPut: properties: status: @@ -5522,12 +5522,12 @@ definitions: x-go-name: Status title: WarningPut represents the modifiable fields of a warning. type: object - x-go-package: github.com/lxc/lxd/shared/api + x-go-package: github.com/canonical/lxd/shared/api info: contact: email: lxc-devel@lists.linuxcontainers.org name: LXD upstream - url: https://github.com/lxc/lxd + url: https://github.com/canonical/lxd description: |- This is the REST API used by all LXD clients. Internal endpoints aren't included in this documentation. diff --git a/doc/security.md b/doc/security.md index b118ea4dd459..1519d22d1793 100644 --- a/doc/security.md +++ b/doc/security.md @@ -8,7 +8,7 @@ See the following sections for detailed information. -If you discover a security issue, see the [LXD security policy](https://github.com/lxc/lxd/blob/master/SECURITY.md) for information on how to report the issue. +If you discover a security issue, see the [LXD security policy](https://github.com/canonical/lxd/blob/master/SECURITY.md) for information on how to report the issue. ## Supported versions diff --git a/fuidshift/main.go b/fuidshift/main.go index 5c24a90686e6..5e9110213f2c 100644 --- a/fuidshift/main.go +++ b/fuidshift/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/fuidshift/main_shift.go b/fuidshift/main_shift.go index bcab6faf36ea..cda970480fab 100644 --- a/fuidshift/main_shift.go +++ b/fuidshift/main_shift.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/shared/idmap" ) type cmdShift struct { diff --git a/go.mod b/go.mod index 406dce595777..0806f0308816 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/lxc/lxd +module github.com/canonical/lxd go 1.17 diff --git a/lxc-to-lxd/config.go b/lxc-to-lxd/config.go index ce4f76328732..89fc4cebc0bf 100644 --- a/lxc-to-lxd/config.go +++ b/lxc-to-lxd/config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) var checkedKeys = []string{ diff --git a/lxc-to-lxd/main.go b/lxc-to-lxd/main.go index 5f20fdb4fb9a..fc73b3001869 100644 --- a/lxc-to-lxd/main.go +++ b/lxc-to-lxd/main.go @@ -47,7 +47,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxc-to-lxd/main_migrate.go b/lxc-to-lxd/main_migrate.go index 6e8c68b9f172..6f526479760f 100644 --- a/lxc-to-lxd/main_migrate.go +++ b/lxc-to-lxd/main_migrate.go @@ -11,12 +11,12 @@ import ( "github.com/spf13/cobra" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/osarch" ) type cmdMigrate struct { diff --git a/lxc-to-lxd/main_netcat.go b/lxc-to-lxd/main_netcat.go index db21bed71acb..e1a515ef3109 100644 --- a/lxc-to-lxd/main_netcat.go +++ b/lxc-to-lxd/main_netcat.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/eagain" + "github.com/canonical/lxd/shared/eagain" ) type cmdNetcat struct { diff --git a/lxc-to-lxd/transfer.go b/lxc-to-lxd/transfer.go index 98878a731027..95606dc83293 100644 --- a/lxc-to-lxd/transfer.go +++ b/lxc-to-lxd/transfer.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/websocket" "github.com/pborman/uuid" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/shared" ) // Send an rsync stream of a path over a websocket diff --git a/lxc-to-lxd/utils.go b/lxc-to-lxd/utils.go index 53655492510e..0b4a8da1a58c 100644 --- a/lxc-to-lxd/utils.go +++ b/lxc-to-lxd/utils.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/migration" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/migration" ) func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rsyncArgs string) error { diff --git a/lxc/action.go b/lxc/action.go index 53100f6b856b..4e3bfb48c25c 100644 --- a/lxc/action.go +++ b/lxc/action.go @@ -7,12 +7,12 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) // Start diff --git a/lxc/alias.go b/lxc/alias.go index 16ce0bbd02ab..3d549c67a7ff 100644 --- a/lxc/alias.go +++ b/lxc/alias.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdAlias struct { diff --git a/lxc/cluster.go b/lxc/cluster.go index 01e1b6f6c2eb..c0a414ca7d2c 100644 --- a/lxc/cluster.go +++ b/lxc/cluster.go @@ -12,12 +12,12 @@ import ( "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdCluster struct { diff --git a/lxc/config.go b/lxc/config.go index 3f52922a282c..ce280f4db67f 100644 --- a/lxc/config.go +++ b/lxc/config.go @@ -9,12 +9,12 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdConfig struct { diff --git a/lxc/config/cert.go b/lxc/config/cert.go index 42ccf8312af6..2527d31b3547 100644 --- a/lxc/config/cert.go +++ b/lxc/config/cert.go @@ -1,7 +1,7 @@ package config import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // HasClientCertificate will return true if a client certificate has already been generated diff --git a/lxc/config/file.go b/lxc/config/file.go index df23a5ba83c4..4af1cd82ca0f 100644 --- a/lxc/config/file.go +++ b/lxc/config/file.go @@ -8,7 +8,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // LoadConfig reads the configuration from the config path; if the path does diff --git a/lxc/config/remote.go b/lxc/config/remote.go index 92ad7bac1d38..e3a31d466e7f 100644 --- a/lxc/config/remote.go +++ b/lxc/config/remote.go @@ -15,8 +15,8 @@ import ( "gopkg.in/macaroon-bakery.v2/httpbakery" "gopkg.in/macaroon-bakery.v2/httpbakery/form" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" ) // Remote holds details for communication with a remote daemon diff --git a/lxc/config_device.go b/lxc/config_device.go index d50f6f9c86a9..76a9abb4f9b9 100644 --- a/lxc/config_device.go +++ b/lxc/config_device.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdConfigDevice struct { diff --git a/lxc/config_metadata.go b/lxc/config_metadata.go index 1af5b4d5930e..b7694f7995eb 100644 --- a/lxc/config_metadata.go +++ b/lxc/config_metadata.go @@ -8,11 +8,11 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdConfigMetadata struct { diff --git a/lxc/config_template.go b/lxc/config_template.go index 9e9538a8f197..b1a338f9452e 100644 --- a/lxc/config_template.go +++ b/lxc/config_template.go @@ -9,11 +9,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdConfigTemplate struct { diff --git a/lxc/config_trust.go b/lxc/config_trust.go index 03fc6c96d475..cbc17c72e96b 100644 --- a/lxc/config_trust.go +++ b/lxc/config_trust.go @@ -9,11 +9,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdConfigTrust struct { diff --git a/lxc/console.go b/lxc/console.go index bdeabb1cf2d1..6e1cba257f0d 100644 --- a/lxc/console.go +++ b/lxc/console.go @@ -13,13 +13,13 @@ import ( "github.com/gorilla/websocket" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/termios" ) type cmdConsole struct { diff --git a/lxc/console_unix.go b/lxc/console_unix.go index 54301f4bcf95..3386da2bd492 100644 --- a/lxc/console_unix.go +++ b/lxc/console_unix.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/websocket" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) func (c *cmdConsole) controlSocketHandler(control *websocket.Conn) { diff --git a/lxc/copy.go b/lxc/copy.go index 3931627dbcb5..e9b9f2b18391 100644 --- a/lxc/copy.go +++ b/lxc/copy.go @@ -6,13 +6,13 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdCopy struct { diff --git a/lxc/delete.go b/lxc/delete.go index e47f51d44e20..0555240a103f 100644 --- a/lxc/delete.go +++ b/lxc/delete.go @@ -8,11 +8,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdDelete struct { diff --git a/lxc/exec.go b/lxc/exec.go index ab100276de68..b0d7654325bf 100644 --- a/lxc/exec.go +++ b/lxc/exec.go @@ -12,12 +12,12 @@ import ( "github.com/gorilla/websocket" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/termios" ) type cmdExec struct { diff --git a/lxc/exec_unix.go b/lxc/exec_unix.go index 6bbf8de89f38..c5617d78be68 100644 --- a/lxc/exec_unix.go +++ b/lxc/exec_unix.go @@ -10,8 +10,8 @@ import ( "github.com/gorilla/websocket" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) func (c *cmdExec) getTERM() (string, bool) { diff --git a/lxc/exec_windows.go b/lxc/exec_windows.go index 849b82d7298c..f9f8276068e7 100644 --- a/lxc/exec_windows.go +++ b/lxc/exec_windows.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/websocket" "golang.org/x/sys/windows" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // Windows doesn't process ANSI sequences natively, so we wrap diff --git a/lxc/export.go b/lxc/export.go index b80774c77b70..bf1285dfce36 100644 --- a/lxc/export.go +++ b/lxc/export.go @@ -9,12 +9,12 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdExport struct { diff --git a/lxc/file.go b/lxc/file.go index e22cdd04bb98..f6cb3beeca49 100644 --- a/lxc/file.go +++ b/lxc/file.go @@ -14,15 +14,15 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/termios" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/termios" + "github.com/canonical/lxd/shared/units" ) // DirMode represents the file mode for creating dirs on `lxc file pull/push` diff --git a/lxc/image.go b/lxc/image.go index 0ff2e1223aec..82c03b81028f 100644 --- a/lxc/image.go +++ b/lxc/image.go @@ -13,13 +13,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type imageColumn struct { diff --git a/lxc/image_alias.go b/lxc/image_alias.go index 07ae48f3da22..59fda0fc32b7 100644 --- a/lxc/image_alias.go +++ b/lxc/image_alias.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdImageAlias struct { diff --git a/lxc/import.go b/lxc/import.go index e2563d840b4e..062c5a3716f3 100644 --- a/lxc/import.go +++ b/lxc/import.go @@ -6,13 +6,13 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) type cmdImport struct { diff --git a/lxc/info.go b/lxc/info.go index fe9a6fc403c9..9d0f76c84476 100644 --- a/lxc/info.go +++ b/lxc/info.go @@ -10,13 +10,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/units" ) type cmdInfo struct { diff --git a/lxc/init.go b/lxc/init.go index d5928a83619e..ccb170324e94 100644 --- a/lxc/init.go +++ b/lxc/init.go @@ -10,13 +10,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdInit struct { diff --git a/lxc/launch.go b/lxc/launch.go index cd0b3c653dc3..b2d641f09276 100644 --- a/lxc/launch.go +++ b/lxc/launch.go @@ -5,10 +5,10 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdLaunch struct { diff --git a/lxc/list.go b/lxc/list.go index 93518af384e9..71159c0849b6 100644 --- a/lxc/list.go +++ b/lxc/list.go @@ -10,15 +10,15 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/units" ) type column struct { diff --git a/lxc/list_test.go b/lxc/list_test.go index 24e06fc2b51a..c25d9c6caa11 100644 --- a/lxc/list_test.go +++ b/lxc/list_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) func TestDotPrefixMatch(t *testing.T) { diff --git a/lxc/main.go b/lxc/main.go index d8b3ee28b110..b6449023d26b 100644 --- a/lxc/main.go +++ b/lxc/main.go @@ -9,14 +9,14 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxc/main_aliases.go b/lxc/main_aliases.go index 12af0e3764ac..06247a22c026 100644 --- a/lxc/main_aliases.go +++ b/lxc/main_aliases.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/i18n" ) var numberedArgRegex = regexp.MustCompile(`@ARG(\d+)@`) diff --git a/lxc/main_test.go b/lxc/main_test.go index 6c686874744c..73b1d51fceed 100644 --- a/lxc/main_test.go +++ b/lxc/main_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/lxc/lxd/lxc/config" + "github.com/canonical/lxd/lxc/config" ) type aliasTestcase struct { diff --git a/lxc/manpage.go b/lxc/manpage.go index 3f2964b31ca4..862fa6ce5f72 100644 --- a/lxc/manpage.go +++ b/lxc/manpage.go @@ -4,9 +4,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/cobra/doc" - "github.com/lxc/lxd/shared" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdManpage struct { diff --git a/lxc/monitor.go b/lxc/monitor.go index 8bfe80738558..dfbf929d9504 100644 --- a/lxc/monitor.go +++ b/lxc/monitor.go @@ -8,12 +8,12 @@ import ( "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/logging" ) type cmdMonitor struct { diff --git a/lxc/move.go b/lxc/move.go index 589847fa2d2a..63b90eb40ede 100644 --- a/lxc/move.go +++ b/lxc/move.go @@ -5,11 +5,11 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" "github.com/pkg/errors" ) diff --git a/lxc/network.go b/lxc/network.go index 4d75c0c8380c..927877378112 100644 --- a/lxc/network.go +++ b/lxc/network.go @@ -10,13 +10,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" + "github.com/canonical/lxd/shared/units" ) type cmdNetwork struct { diff --git a/lxc/operation.go b/lxc/operation.go index 6fe2be845f53..db408522289c 100644 --- a/lxc/operation.go +++ b/lxc/operation.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/lxc/utils" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdOperation struct { diff --git a/lxc/profile.go b/lxc/profile.go index 930f0ba46375..02044dcd93a3 100644 --- a/lxc/profile.go +++ b/lxc/profile.go @@ -10,12 +10,12 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdProfile struct { diff --git a/lxc/project.go b/lxc/project.go index 549c86332bee..faff21597b45 100644 --- a/lxc/project.go +++ b/lxc/project.go @@ -10,12 +10,12 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type cmdProject struct { diff --git a/lxc/publish.go b/lxc/publish.go index 190137eeac57..e6a4a1afe831 100644 --- a/lxc/publish.go +++ b/lxc/publish.go @@ -6,13 +6,13 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) type cmdPublish struct { diff --git a/lxc/query.go b/lxc/query.go index cedd9e04138e..9290f63c894b 100644 --- a/lxc/query.go +++ b/lxc/query.go @@ -11,9 +11,9 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdQuery struct { diff --git a/lxc/remote.go b/lxc/remote.go index 8faf04ef7dae..fa3b13a07020 100644 --- a/lxc/remote.go +++ b/lxc/remote.go @@ -13,13 +13,13 @@ import ( "github.com/spf13/cobra" "golang.org/x/term" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdRemote struct { diff --git a/lxc/rename.go b/lxc/rename.go index dee6b151c9fe..30f587ce445e 100644 --- a/lxc/rename.go +++ b/lxc/rename.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdRename struct { diff --git a/lxc/restore.go b/lxc/restore.go index d735cddbe898..80f48b202859 100644 --- a/lxc/restore.go +++ b/lxc/restore.go @@ -5,10 +5,10 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" ) type cmdRestore struct { diff --git a/lxc/snapshot.go b/lxc/snapshot.go index 5ec5bfb2b719..bbde7aa6c245 100644 --- a/lxc/snapshot.go +++ b/lxc/snapshot.go @@ -3,10 +3,10 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" "fmt" "strings" diff --git a/lxc/storage.go b/lxc/storage.go index fcb45db8a255..52f67200f0c4 100644 --- a/lxc/storage.go +++ b/lxc/storage.go @@ -11,13 +11,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" + "github.com/canonical/lxd/shared/units" ) type cmdStorage struct { diff --git a/lxc/storage_volume.go b/lxc/storage_volume.go index 404b24b1449b..4c0a87f4059b 100644 --- a/lxc/storage_volume.go +++ b/lxc/storage_volume.go @@ -12,13 +12,13 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type volumeColumn struct { diff --git a/lxc/utils.go b/lxc/utils.go index d079cbaa6a62..2c5e5ae9e68d 100644 --- a/lxc/utils.go +++ b/lxc/utils.go @@ -10,10 +10,10 @@ import ( "github.com/fvbommel/sortorder" "github.com/pkg/errors" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/termios" ) type stringList [][]string diff --git a/lxc/utils/cancel.go b/lxc/utils/cancel.go index 5c86a49828eb..2cd9bbbe2037 100644 --- a/lxc/utils/cancel.go +++ b/lxc/utils/cancel.go @@ -6,8 +6,8 @@ import ( "os/signal" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/i18n" ) // CancelableWait waits for an operation and cancel it on SIGINT/SIGTERM diff --git a/lxc/utils/progress.go b/lxc/utils/progress.go index 9b7ef1892d87..e73194e80b93 100644 --- a/lxc/utils/progress.go +++ b/lxc/utils/progress.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/termios" ) // ProgressRenderer tracks the progress information diff --git a/lxc/utils/table.go b/lxc/utils/table.go index 4cf9ae50c3d8..9a9e68f3606c 100644 --- a/lxc/utils/table.go +++ b/lxc/utils/table.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/lxc/lxd/shared/i18n" + "github.com/canonical/lxd/shared/i18n" "github.com/olekukonko/tablewriter" "gopkg.in/yaml.v2" ) diff --git a/lxc/utils_test.go b/lxc/utils_test.go index f8ad029e7327..6db6a99998c0 100644 --- a/lxc/utils_test.go +++ b/lxc/utils_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) type utilsTestSuite struct { diff --git a/lxc/version.go b/lxc/version.go index e0128c40e076..50721b382d6d 100644 --- a/lxc/version.go +++ b/lxc/version.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/i18n" - "github.com/lxc/lxd/shared/version" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/i18n" + "github.com/canonical/lxd/shared/version" ) type cmdVersion struct { diff --git a/lxd-agent/api.go b/lxd-agent/api.go index 33ed7d9722a0..46fb8b3e9fcf 100644 --- a/lxd-agent/api.go +++ b/lxd-agent/api.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/lxc/lxd/lxd/response" + "github.com/canonical/lxd/lxd/response" ) // APIEndpoint represents a URL in our API. diff --git a/lxd-agent/api_1.0.go b/lxd-agent/api_1.0.go index ccae95060f07..177d5cdabe95 100644 --- a/lxd-agent/api_1.0.go +++ b/lxd-agent/api_1.0.go @@ -4,10 +4,10 @@ import ( "net/http" "os" - "github.com/lxc/lxd/lxd/response" - lxdshared "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/response" + lxdshared "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var api10Cmd = APIEndpoint{ diff --git a/lxd-agent/daemon.go b/lxd-agent/daemon.go index 9b4844a8008f..d30c6c1d9cc5 100644 --- a/lxd-agent/daemon.go +++ b/lxd-agent/daemon.go @@ -1,7 +1,7 @@ package main import ( - "github.com/lxc/lxd/lxd/events" + "github.com/canonical/lxd/lxd/events" ) // A Daemon can respond to requests from a shared client. diff --git a/lxd-agent/devlxd.go b/lxd-agent/devlxd.go index c04d7b52824d..f629f730e32e 100644 --- a/lxd-agent/devlxd.go +++ b/lxd-agent/devlxd.go @@ -11,11 +11,11 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // DevLxdServer creates an http.Server capable of handling requests against the diff --git a/lxd-agent/events.go b/lxd-agent/events.go index 24336fcd0f40..ef1a0c74181e 100644 --- a/lxd-agent/events.go +++ b/lxd-agent/events.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) var eventsCmd = APIEndpoint{ diff --git a/lxd-agent/exec.go b/lxd-agent/exec.go index 206fe0c58b08..c55074d1ce31 100644 --- a/lxd-agent/exec.go +++ b/lxd-agent/exec.go @@ -18,14 +18,14 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/netutils" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/netutils" ) const execWSControl = -1 diff --git a/lxd-agent/file.go b/lxd-agent/file.go index 19a5cd00e1c2..79dda089723d 100644 --- a/lxd-agent/file.go +++ b/lxd-agent/file.go @@ -10,8 +10,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" ) var fileCmd = APIEndpoint{ diff --git a/lxd-agent/main.go b/lxd-agent/main.go index c6c750482f66..e89a4af1034a 100644 --- a/lxd-agent/main.go +++ b/lxd-agent/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxd-agent/main_agent.go b/lxd-agent/main_agent.go index ddfb39f2ba59..d315560be4f8 100644 --- a/lxd-agent/main_agent.go +++ b/lxd-agent/main_agent.go @@ -16,12 +16,12 @@ import ( "github.com/spf13/cobra" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/lxd/vsock" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/lxd/vsock" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) type cmdAgent struct { diff --git a/lxd-agent/network.go b/lxd-agent/network.go index e01849376479..56de95f0d2b8 100644 --- a/lxd-agent/network.go +++ b/lxd-agent/network.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // A variation of the standard tls.Listener that supports atomically swapping diff --git a/lxd-agent/operations.go b/lxd-agent/operations.go index 3c8f033f1317..aff59ba13817 100644 --- a/lxd-agent/operations.go +++ b/lxd-agent/operations.go @@ -8,11 +8,11 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) var operationCmd = APIEndpoint{ diff --git a/lxd-agent/server.go b/lxd-agent/server.go index 4ba471ca04d0..fac40701d1b7 100644 --- a/lxd-agent/server.go +++ b/lxd-agent/server.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) func restServer(tlsConfig *tls.Config, cert *x509.Certificate, debug bool, d *Daemon) *http.Server { diff --git a/lxd-agent/state.go b/lxd-agent/state.go index ff8292e720a3..850d938b387c 100644 --- a/lxd-agent/state.go +++ b/lxd-agent/state.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var stateCmd = APIEndpoint{ diff --git a/lxd-agent/templates.go b/lxd-agent/templates.go index 8e49788a4ddc..7db0f76f3c34 100644 --- a/lxd-agent/templates.go +++ b/lxd-agent/templates.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) func templatesApply(path string) ([]string, error) { diff --git a/lxd-benchmark/benchmark/benchmark.go b/lxd-benchmark/benchmark/benchmark.go index 2d96f6fdb860..4be2873f47b3 100644 --- a/lxd-benchmark/benchmark/benchmark.go +++ b/lxd-benchmark/benchmark/benchmark.go @@ -6,10 +6,10 @@ import ( "sync" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/config" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/config" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) const userConfigKey = "user.lxd-benchmark" diff --git a/lxd-benchmark/benchmark/operation.go b/lxd-benchmark/benchmark/operation.go index b4f4f3cea7b9..2a0f466e504a 100644 --- a/lxd-benchmark/benchmark/operation.go +++ b/lxd-benchmark/benchmark/operation.go @@ -1,8 +1,8 @@ package benchmark import ( - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" ) func createContainer(c lxd.ContainerServer, fingerprint string, name string, privileged bool) error { diff --git a/lxd-benchmark/main.go b/lxd-benchmark/main.go index 4aac4b90fcf7..b8aa1573ff34 100644 --- a/lxd-benchmark/main.go +++ b/lxd-benchmark/main.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd-benchmark/benchmark" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxd-benchmark/main_delete.go b/lxd-benchmark/main_delete.go index c9c12f177274..991fef0743d3 100644 --- a/lxd-benchmark/main_delete.go +++ b/lxd-benchmark/main_delete.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdDelete struct { diff --git a/lxd-benchmark/main_init.go b/lxd-benchmark/main_init.go index 7e2068b71d35..2cddb76b3a8d 100644 --- a/lxd-benchmark/main_init.go +++ b/lxd-benchmark/main_init.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdInit struct { diff --git a/lxd-benchmark/main_launch.go b/lxd-benchmark/main_launch.go index 1753879279e9..44c0a999f7c4 100644 --- a/lxd-benchmark/main_launch.go +++ b/lxd-benchmark/main_launch.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdLaunch struct { diff --git a/lxd-benchmark/main_start.go b/lxd-benchmark/main_start.go index c1cc0e3d5891..1f510296d827 100644 --- a/lxd-benchmark/main_start.go +++ b/lxd-benchmark/main_start.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdStart struct { diff --git a/lxd-benchmark/main_stop.go b/lxd-benchmark/main_stop.go index 056e0e179c9d..5b2c93d8737f 100644 --- a/lxd-benchmark/main_stop.go +++ b/lxd-benchmark/main_stop.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd-benchmark/benchmark" + "github.com/canonical/lxd/lxd-benchmark/benchmark" ) type cmdStop struct { diff --git a/lxd-p2c/main.go b/lxd-p2c/main.go index a26f8b9ce7c8..df7253eb59ab 100644 --- a/lxd-p2c/main.go +++ b/lxd-p2c/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) type cmdGlobal struct { diff --git a/lxd-p2c/main_migrate.go b/lxd-p2c/main_migrate.go index 50b2da07ae45..dfd28839e047 100644 --- a/lxd-p2c/main_migrate.go +++ b/lxd-p2c/main_migrate.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/cobra" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) type cmdMigrate struct { diff --git a/lxd-p2c/main_netcat.go b/lxd-p2c/main_netcat.go index db21bed71acb..e1a515ef3109 100644 --- a/lxd-p2c/main_netcat.go +++ b/lxd-p2c/main_netcat.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared/eagain" + "github.com/canonical/lxd/shared/eagain" ) type cmdNetcat struct { diff --git a/lxd-p2c/transfer.go b/lxd-p2c/transfer.go index f3811225c6d8..67150e932b03 100644 --- a/lxd-p2c/transfer.go +++ b/lxd-p2c/transfer.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/websocket" "github.com/pborman/uuid" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/shared" ) // Send an rsync stream of a path over a websocket diff --git a/lxd-p2c/utils.go b/lxd-p2c/utils.go index 5b410451b778..b9a5c1f62682 100644 --- a/lxd-p2c/utils.go +++ b/lxd-p2c/utils.go @@ -11,11 +11,11 @@ import ( "golang.org/x/sys/unix" "golang.org/x/term" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rsyncArgs string) error { diff --git a/lxd/api.go b/lxd/api.go index df36293030c7..d0392f7c492b 100644 --- a/lxd/api.go +++ b/lxd/api.go @@ -8,13 +8,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/project" - lxdRequest "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/project" + lxdRequest "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared/logger" ) // swagger:operation GET / server api_get diff --git a/lxd/api_1.0.go b/lxd/api_1.0.go index f3587edfc8c8..20eef6c2bb54 100644 --- a/lxd/api_1.0.go +++ b/lxd/api_1.0.go @@ -7,23 +7,23 @@ import ( "os" "strings" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/config" - "github.com/lxc/lxd/lxd/db" - instanceDrivers "github.com/lxc/lxd/lxd/instance/drivers" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/config" + "github.com/canonical/lxd/lxd/db" + instanceDrivers "github.com/canonical/lxd/lxd/instance/drivers" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/pkg/errors" ) diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go index fe329c7d919f..f0e79c9040bf 100644 --- a/lxd/api_cluster.go +++ b/lxd/api_cluster.go @@ -17,23 +17,23 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" ) var targetGroupPrefix = "@" diff --git a/lxd/api_cluster_test.go b/lxd/api_cluster_test.go index 90859fd3f46d..000d72514844 100644 --- a/lxd/api_cluster_test.go +++ b/lxd/api_cluster_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/api_internal.go b/lxd/api_internal.go index a436db80f87e..28033d018225 100644 --- a/lxd/api_internal.go +++ b/lxd/api_internal.go @@ -18,25 +18,25 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/node" - "github.com/lxc/lxd/lxd/db/query" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/query" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/units" ) var apiInternal = []APIEndpoint{ diff --git a/lxd/api_internal_recover.go b/lxd/api_internal_recover.go index f151ba330ae4..bde66d08bc4b 100644 --- a/lxd/api_internal_recover.go +++ b/lxd/api_internal_recover.go @@ -8,21 +8,21 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" ) // Define API endpoints for recover actions. diff --git a/lxd/api_internal_test.go b/lxd/api_internal_test.go index aedcae3c437b..48d67e95b79d 100644 --- a/lxd/api_internal_test.go +++ b/lxd/api_internal_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Test that an instance with a local root disk device just gets its pool property modified. diff --git a/lxd/api_networks_test.go b/lxd/api_networks_test.go index 4b71c4139b10..07cc338adf2a 100644 --- a/lxd/api_networks_test.go +++ b/lxd/api_networks_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/api_project.go b/lxd/api_project.go index 240ed4152beb..e0670e2d0a34 100644 --- a/lxd/api_project.go +++ b/lxd/api_project.go @@ -12,19 +12,19 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/operations" - projecthelpers "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/operations" + projecthelpers "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) var projectFeatures = []string{"features.images", "features.profiles", "features.storage.volumes"} diff --git a/lxd/api_storage_pools_test.go b/lxd/api_storage_pools_test.go index 0e291a7be242..cc47f2fe5e84 100644 --- a/lxd/api_storage_pools_test.go +++ b/lxd/api_storage_pools_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/apparmor/apparmor.go b/lxd/apparmor/apparmor.go index 9d8ec55f469c..21e23f3b1285 100644 --- a/lxd/apparmor/apparmor.go +++ b/lxd/apparmor/apparmor.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) const ( diff --git a/lxd/apparmor/instance.go b/lxd/apparmor/instance.go index 6afe46684151..34dd585a6c76 100644 --- a/lxd/apparmor/instance.go +++ b/lxd/apparmor/instance.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // Internal copy of the instance interface. diff --git a/lxd/apparmor/instance_forkproxy.go b/lxd/apparmor/instance_forkproxy.go index 5518e53b2d30..04b778e5e920 100644 --- a/lxd/apparmor/instance_forkproxy.go +++ b/lxd/apparmor/instance_forkproxy.go @@ -8,11 +8,11 @@ import ( "strings" "text/template" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // Internal copy of the device interface. diff --git a/lxd/apparmor/network.go b/lxd/apparmor/network.go index e5b2698c796f..4b08a40f9787 100644 --- a/lxd/apparmor/network.go +++ b/lxd/apparmor/network.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/lxc/lxd/lxd/state" + "github.com/canonical/lxd/lxd/state" ) // Internal copy of the network interface. diff --git a/lxd/apparmor/network_dnsmasq.go b/lxd/apparmor/network_dnsmasq.go index bedf098395f5..66d400fe915d 100644 --- a/lxd/apparmor/network_dnsmasq.go +++ b/lxd/apparmor/network_dnsmasq.go @@ -5,8 +5,8 @@ import ( "strings" "text/template" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" ) var dnsmasqProfileTpl = template.Must(template.New("dnsmasqProfile").Parse(`#include diff --git a/lxd/apparmor/network_forkdns.go b/lxd/apparmor/network_forkdns.go index bc5dfecfc94f..1f3a6368c5c7 100644 --- a/lxd/apparmor/network_forkdns.go +++ b/lxd/apparmor/network_forkdns.go @@ -6,9 +6,9 @@ import ( "strings" "text/template" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) var forkdnsProfileTpl = template.Must(template.New("forkdnsProfile").Parse(`#include diff --git a/lxd/backup.go b/lxd/backup.go index 8f0c0bd3ee41..72e9cf08065e 100644 --- a/lxd/backup.go +++ b/lxd/backup.go @@ -13,26 +13,26 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/units" ) // Create a new backup. diff --git a/lxd/backup/backup_common.go b/lxd/backup/backup_common.go index 6b298bcdd215..5638fd066fd7 100644 --- a/lxd/backup/backup_common.go +++ b/lxd/backup/backup_common.go @@ -3,7 +3,7 @@ package backup import ( "time" - "github.com/lxc/lxd/lxd/state" + "github.com/canonical/lxd/lxd/state" ) // WorkingDirPrefix is used when temporary working directories are needed. diff --git a/lxd/backup/backup_config.go b/lxd/backup/backup_config.go index 7a9a43859b04..59dc8e2a511e 100644 --- a/lxd/backup/backup_config.go +++ b/lxd/backup/backup_config.go @@ -8,12 +8,12 @@ import ( "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // Config represents the config of a backup that can be stored in a backup.yaml file (or embedded in index.yaml). diff --git a/lxd/backup/backup_info.go b/lxd/backup/backup_info.go index 1dd3aa90e827..dad7829f235e 100644 --- a/lxd/backup/backup_info.go +++ b/lxd/backup/backup_info.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Type indicates the type of backup. diff --git a/lxd/backup/backup_instance.go b/lxd/backup/backup_instance.go index 8eeb975a9293..1388222a88ca 100644 --- a/lxd/backup/backup_instance.go +++ b/lxd/backup/backup_instance.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Instance represents the backup relevant subset of a LXD instance. diff --git a/lxd/backup/backup_utils.go b/lxd/backup/backup_utils.go index 08dc35918cc5..1fd8842c02af 100644 --- a/lxd/backup/backup_utils.go +++ b/lxd/backup/backup_utils.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // TarReader rewinds backup file handle r and returns new tar reader and process cleanup function. diff --git a/lxd/certificates.go b/lxd/certificates.go index 11649244926c..37879bc1c9af 100644 --- a/lxd/certificates.go +++ b/lxd/certificates.go @@ -14,20 +14,20 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) type certificateCache struct { diff --git a/lxd/cgroup/abstraction.go b/lxd/cgroup/abstraction.go index 5a4752efad9d..b42a23c7d3e3 100644 --- a/lxd/cgroup/abstraction.go +++ b/lxd/cgroup/abstraction.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // CGroup represents the main cgroup abstraction. diff --git a/lxd/cgroup/file.go b/lxd/cgroup/file.go index e98fb8fcf8e6..e3efd4b01f46 100644 --- a/lxd/cgroup/file.go +++ b/lxd/cgroup/file.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // NewFileReadWriter returns a CGroup instance using the filesystem as its backend. diff --git a/lxd/cgroup/init.go b/lxd/cgroup/init.go index cf519aab3afb..867ce8f0bf09 100644 --- a/lxd/cgroup/init.go +++ b/lxd/cgroup/init.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) var cgControllers = map[string]Backend{} diff --git a/lxd/cluster/config.go b/lxd/cluster/config.go index a63e8b715022..0046a4622ec1 100644 --- a/lxd/cluster/config.go +++ b/lxd/cluster/config.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/scrypt" - "github.com/lxc/lxd/lxd/config" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/config" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared/validate" ) // Config holds cluster-wide configuration values. diff --git a/lxd/cluster/config_test.go b/lxd/cluster/config_test.go index b0f6d9fe169e..7c26ff5d64bd 100644 --- a/lxd/cluster/config_test.go +++ b/lxd/cluster/config_test.go @@ -3,8 +3,8 @@ package cluster_test import ( "testing" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/connect.go b/lxd/cluster/connect.go index affd55ae291b..f0d8af99b55c 100644 --- a/lxd/cluster/connect.go +++ b/lxd/cluster/connect.go @@ -13,16 +13,16 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/client" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) // ErrCertificateExists indicates that a certificate already exists. diff --git a/lxd/cluster/events.go b/lxd/cluster/events.go index cf900f4bdabd..2ae52f01dbc0 100644 --- a/lxd/cluster/events.go +++ b/lxd/cluster/events.go @@ -7,13 +7,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/endpoints" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/endpoints" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var listeners = map[string]*lxd.EventListener{} diff --git a/lxd/cluster/gateway.go b/lxd/cluster/gateway.go index 6de4c4a7dd0b..376af806409a 100644 --- a/lxd/cluster/gateway.go +++ b/lxd/cluster/gateway.go @@ -22,11 +22,11 @@ import ( client "github.com/canonical/go-dqlite/client" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" "github.com/pkg/errors" ) diff --git a/lxd/cluster/gateway_export_test.go b/lxd/cluster/gateway_export_test.go index 03d246c0eff8..7bdf95650a11 100644 --- a/lxd/cluster/gateway_export_test.go +++ b/lxd/cluster/gateway_export_test.go @@ -1,8 +1,8 @@ package cluster import ( - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared" ) // IsLeader returns true if this node is the leader. diff --git a/lxd/cluster/gateway_test.go b/lxd/cluster/gateway_test.go index 5557bda2df68..6bfd29b9cc5f 100644 --- a/lxd/cluster/gateway_test.go +++ b/lxd/cluster/gateway_test.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/heartbeat.go b/lxd/cluster/heartbeat.go index 146f09987d00..855098ccc23c 100644 --- a/lxd/cluster/heartbeat.go +++ b/lxd/cluster/heartbeat.go @@ -12,13 +12,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" "github.com/pkg/errors" ) diff --git a/lxd/cluster/heartbeat_test.go b/lxd/cluster/heartbeat_test.go index f85d79fc5b00..911416c7ba3a 100644 --- a/lxd/cluster/heartbeat_test.go +++ b/lxd/cluster/heartbeat_test.go @@ -9,12 +9,12 @@ import ( "time" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/info.go b/lxd/cluster/info.go index 9832e4e8128e..0b5a5a45a670 100644 --- a/lxd/cluster/info.go +++ b/lxd/cluster/info.go @@ -7,10 +7,10 @@ import ( "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" "github.com/pkg/errors" ) diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go index 0011ed35d1f9..7f323cd1b517 100644 --- a/lxd/cluster/membership.go +++ b/lxd/cluster/membership.go @@ -15,14 +15,14 @@ import ( "gopkg.in/inconshreveable/log15.v2" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" "github.com/pkg/errors" ) diff --git a/lxd/cluster/membership_test.go b/lxd/cluster/membership_test.go index f72f8db5badc..21b422650cbb 100644 --- a/lxd/cluster/membership_test.go +++ b/lxd/cluster/membership_test.go @@ -11,12 +11,12 @@ import ( "time" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/migrate.go b/lxd/cluster/migrate.go index 91d3d2ad83a6..ea9f58076a35 100644 --- a/lxd/cluster/migrate.go +++ b/lxd/cluster/migrate.go @@ -9,8 +9,8 @@ import ( "strconv" "github.com/hashicorp/go-msgpack/codec" - "github.com/lxc/lxd/lxd/cluster/raft" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cluster/raft" + "github.com/canonical/lxd/shared" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" ) diff --git a/lxd/cluster/migrate_test.go b/lxd/cluster/migrate_test.go index 4f1bd88d2fbb..6aaed8c60f44 100644 --- a/lxd/cluster/migrate_test.go +++ b/lxd/cluster/migrate_test.go @@ -9,8 +9,8 @@ import ( dqlite "github.com/canonical/go-dqlite" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/notify.go b/lxd/cluster/notify.go index 660d3547e3d8..4c93f6d3472e 100644 --- a/lxd/cluster/notify.go +++ b/lxd/cluster/notify.go @@ -5,12 +5,12 @@ import ( "sync" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" "github.com/pkg/errors" ) diff --git a/lxd/cluster/notify_test.go b/lxd/cluster/notify_test.go index 869877c49d84..885dabf96d1c 100644 --- a/lxd/cluster/notify_test.go +++ b/lxd/cluster/notify_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/cluster/raft_test.go b/lxd/cluster/raft_test.go index 8fe5ab3e27ba..ea5f9bc3f248 100644 --- a/lxd/cluster/raft_test.go +++ b/lxd/cluster/raft_test.go @@ -8,9 +8,9 @@ import ( "github.com/canonical/go-dqlite/client" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // Set the cluster.https_address config key to the given address, and insert the diff --git a/lxd/cluster/recover.go b/lxd/cluster/recover.go index 838193522b5b..dcc8165c0d48 100644 --- a/lxd/cluster/recover.go +++ b/lxd/cluster/recover.go @@ -10,8 +10,8 @@ import ( dqlite "github.com/canonical/go-dqlite" client "github.com/canonical/go-dqlite/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" "github.com/pkg/errors" ) diff --git a/lxd/cluster/resolve.go b/lxd/cluster/resolve.go index 084fa9db2443..f0ca21708a71 100644 --- a/lxd/cluster/resolve.go +++ b/lxd/cluster/resolve.go @@ -3,7 +3,7 @@ package cluster import ( "fmt" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) // ResolveTarget is a convenience for handling the value ?targetNode query diff --git a/lxd/cluster/tls.go b/lxd/cluster/tls.go index f19faae3c7cf..ad02b5239202 100644 --- a/lxd/cluster/tls.go +++ b/lxd/cluster/tls.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Return a TLS configuration suitable for establishing intra-member network connections using the server cert. diff --git a/lxd/cluster/upgrade.go b/lxd/cluster/upgrade.go index 721b4298d641..de54bdb62beb 100644 --- a/lxd/cluster/upgrade.go +++ b/lxd/cluster/upgrade.go @@ -12,11 +12,11 @@ import ( "gopkg.in/inconshreveable/log15.v2" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" "github.com/pkg/errors" ) diff --git a/lxd/cluster/upgrade_test.go b/lxd/cluster/upgrade_test.go index 0ca869fb267a..0dfd5eec9041 100644 --- a/lxd/cluster/upgrade_test.go +++ b/lxd/cluster/upgrade_test.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" ) // A node can unblock other nodes that were waiting for a cluster upgrade to diff --git a/lxd/config/map.go b/lxd/config/map.go index 9a13a134fb09..9958ec535a42 100644 --- a/lxd/config/map.go +++ b/lxd/config/map.go @@ -6,7 +6,7 @@ import ( "sort" "strconv" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Map is a structured map of config keys to config values. diff --git a/lxd/config/map_test.go b/lxd/config/map_test.go index 25363a155d03..6b83e07fb443 100644 --- a/lxd/config/map_test.go +++ b/lxd/config/map_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/lxc/lxd/lxd/config" + "github.com/canonical/lxd/lxd/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/config/safe.go b/lxd/config/safe.go index a342832b22a6..5ccc37e85678 100644 --- a/lxd/config/safe.go +++ b/lxd/config/safe.go @@ -5,7 +5,7 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // SafeLoad is a wrapper around Load() that does not error when invalid keys diff --git a/lxd/config/safe_test.go b/lxd/config/safe_test.go index 92c79c6d6744..52f3d18922a2 100644 --- a/lxd/config/safe_test.go +++ b/lxd/config/safe_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/config" + "github.com/canonical/lxd/lxd/config" ) // If the givne values contain invalid keys, they are ignored. diff --git a/lxd/config/schema.go b/lxd/config/schema.go index a1bbc3edad14..6aba9d73f45c 100644 --- a/lxd/config/schema.go +++ b/lxd/config/schema.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Schema defines the available keys of a config Map, along with the types diff --git a/lxd/config/schema_test.go b/lxd/config/schema_test.go index b9a62760c470..e438f4df3a86 100644 --- a/lxd/config/schema_test.go +++ b/lxd/config/schema_test.go @@ -3,7 +3,7 @@ package config_test import ( "testing" - "github.com/lxc/lxd/lxd/config" + "github.com/canonical/lxd/lxd/config" "github.com/stretchr/testify/assert" ) diff --git a/lxd/config/validators_test.go b/lxd/config/validators_test.go index 44d6f3e07286..969de47eeb9c 100644 --- a/lxd/config/validators_test.go +++ b/lxd/config/validators_test.go @@ -3,7 +3,7 @@ package config_test import ( "testing" - "github.com/lxc/lxd/lxd/config" + "github.com/canonical/lxd/lxd/config" "github.com/stretchr/testify/assert" ) diff --git a/lxd/daemon.go b/lxd/daemon.go index 38912c164342..341588c8aa0d 100644 --- a/lxd/daemon.go +++ b/lxd/daemon.go @@ -31,38 +31,38 @@ import ( "gopkg.in/macaroon-bakery.v2/bakery/identchecker" "gopkg.in/macaroon-bakery.v2/httpbakery" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/endpoints" - "github.com/lxc/lxd/lxd/events" - "github.com/lxc/lxd/lxd/firewall" - "github.com/lxc/lxd/lxd/fsmonitor" - devmonitor "github.com/lxc/lxd/lxd/fsmonitor" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/ucred" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/endpoints" + "github.com/canonical/lxd/lxd/events" + "github.com/canonical/lxd/lxd/firewall" + "github.com/canonical/lxd/lxd/fsmonitor" + devmonitor "github.com/canonical/lxd/lxd/fsmonitor" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/ucred" // Import instance/drivers without name so init() runs. - _ "github.com/lxc/lxd/lxd/instance/drivers" - instanceDrivers "github.com/lxc/lxd/lxd/instance/drivers" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/maas" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/seccomp" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + _ "github.com/canonical/lxd/lxd/instance/drivers" + instanceDrivers "github.com/canonical/lxd/lxd/instance/drivers" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/maas" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/seccomp" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // A Daemon can respond to requests from a shared client. diff --git a/lxd/daemon_config.go b/lxd/daemon_config.go index 57b6f04533a1..ad771b4c9d60 100644 --- a/lxd/daemon_config.go +++ b/lxd/daemon_config.go @@ -1,11 +1,11 @@ package main import ( - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" ) func daemonConfigRender(state *state.State) (map[string]interface{}, error) { diff --git a/lxd/daemon_images.go b/lxd/daemon_images.go index 432a814d404f..9cebb088bf45 100644 --- a/lxd/daemon_images.go +++ b/lxd/daemon_images.go @@ -12,21 +12,21 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/locking" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/locking" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/version" ) // ImageDownloadArgs used with ImageDownload. diff --git a/lxd/daemon_integration_test.go b/lxd/daemon_integration_test.go index 815db3afd319..6ae1ccc3de90 100644 --- a/lxd/daemon_integration_test.go +++ b/lxd/daemon_integration_test.go @@ -7,10 +7,10 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/daemon_storage.go b/lxd/daemon_storage.go index 6db3bda91fa6..dacd5d600cec 100644 --- a/lxd/daemon_storage.go +++ b/lxd/daemon_storage.go @@ -9,14 +9,14 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" ) func daemonStorageVolumesUnmount(s *state.State) error { diff --git a/lxd/db/backups.go b/lxd/db/backups.go index f5516380c771..e5cf2c247977 100644 --- a/lxd/db/backups.go +++ b/lxd/db/backups.go @@ -10,7 +10,7 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // InstanceBackup is a value object holding all db-related details about an instance backup. diff --git a/lxd/db/certificates.go b/lxd/db/certificates.go index 8a650c0c7af1..17cc0abdcff7 100644 --- a/lxd/db/certificates.go +++ b/lxd/db/certificates.go @@ -6,8 +6,8 @@ package db import ( "fmt" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" "github.com/pkg/errors" ) diff --git a/lxd/db/certificates.mapper.go b/lxd/db/certificates.mapper.go index 8e85ae67b681..2df2e139278d 100644 --- a/lxd/db/certificates.mapper.go +++ b/lxd/db/certificates.mapper.go @@ -9,9 +9,9 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/certificates_test.go b/lxd/db/certificates_test.go index 478acfd7e98e..d58801bc234d 100644 --- a/lxd/db/certificates_test.go +++ b/lxd/db/certificates_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) func TestGetCertificate(t *testing.T) { diff --git a/lxd/db/cluster/constants.go b/lxd/db/cluster/constants.go index b417d8194628..480f6c714539 100644 --- a/lxd/db/cluster/constants.go +++ b/lxd/db/cluster/constants.go @@ -1,7 +1,7 @@ package cluster import ( - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared/version" ) // Numeric type codes identifying different kind of entities. diff --git a/lxd/db/cluster/open.go b/lxd/db/cluster/open.go index 347624f677f6..f863d3c341b0 100644 --- a/lxd/db/cluster/open.go +++ b/lxd/db/cluster/open.go @@ -7,13 +7,13 @@ import ( "sync/atomic" driver "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/pkg/errors" ) diff --git a/lxd/db/cluster/open_test.go b/lxd/db/cluster/open_test.go index e2b3d2e1c3ef..16a27a2d16d9 100644 --- a/lxd/db/cluster/open_test.go +++ b/lxd/db/cluster/open_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/cluster/query.go b/lxd/db/cluster/query.go index 16b7aedf9934..17602398934b 100644 --- a/lxd/db/cluster/query.go +++ b/lxd/db/cluster/query.go @@ -4,7 +4,7 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" ) // Update the schema and api_extensions columns of the row in the nodes table diff --git a/lxd/db/cluster/update.go b/lxd/db/cluster/update.go index 32acf0d8f59e..a7359bbdbe6c 100644 --- a/lxd/db/cluster/update.go +++ b/lxd/db/cluster/update.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" "github.com/pkg/errors" ) diff --git a/lxd/db/cluster/update_test.go b/lxd/db/cluster/update_test.go index 548a5636bcab..4c44939ac498 100644 --- a/lxd/db/cluster/update_test.go +++ b/lxd/db/cluster/update_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/osarch" "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/lxd/db/config.go b/lxd/db/config.go index 0c2d90e8ceac..029f73515572 100644 --- a/lxd/db/config.go +++ b/lxd/db/config.go @@ -3,7 +3,7 @@ package db -import "github.com/lxc/lxd/lxd/db/query" +import "github.com/canonical/lxd/lxd/db/query" // Code generation directives. // diff --git a/lxd/db/config.mapper.go b/lxd/db/config.mapper.go index 00cbd97434d5..0add03d4f91b 100644 --- a/lxd/db/config.mapper.go +++ b/lxd/db/config.mapper.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/config_test.go b/lxd/db/config_test.go index 0c09a61868c3..24193262b96b 100644 --- a/lxd/db/config_test.go +++ b/lxd/db/config_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/db.go b/lxd/db/db.go index a3f26f0ad6a2..680a5e4d2856 100644 --- a/lxd/db/db.go +++ b/lxd/db/db.go @@ -20,11 +20,11 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/node" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Node mediates access to LXD's data stored in the node-local SQLite database. diff --git a/lxd/db/db_internal_test.go b/lxd/db/db_internal_test.go index 5b0c123d092f..b20de10a2891 100644 --- a/lxd/db/db_internal_test.go +++ b/lxd/db/db_internal_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) const fixtures string = ` diff --git a/lxd/db/db_test.go b/lxd/db/db_test.go index f604ed48f4d3..1483904b7a48 100644 --- a/lxd/db/db_test.go +++ b/lxd/db/db_test.go @@ -6,8 +6,8 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/devices.mapper.go b/lxd/db/devices.mapper.go index 9579ea31bdc8..107001ef5a35 100644 --- a/lxd/db/devices.mapper.go +++ b/lxd/db/devices.mapper.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/generate/db.go b/lxd/db/generate/db.go index 171ec72f8772..8d83fad72cb4 100644 --- a/lxd/db/generate/db.go +++ b/lxd/db/generate/db.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd/db/generate/db" - "github.com/lxc/lxd/lxd/db/generate/file" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/db" + "github.com/canonical/lxd/lxd/db/generate/file" + "github.com/canonical/lxd/lxd/db/generate/lex" ) // Return a new db command. diff --git a/lxd/db/generate/db/constants.go b/lxd/db/generate/db/constants.go index 8e03c606763c..eef3a16049ba 100644 --- a/lxd/db/generate/db/constants.go +++ b/lxd/db/generate/db/constants.go @@ -4,7 +4,7 @@ package db var Imports = []string{ "database/sql", "fmt", - "github.com/lxc/lxd/lxd/db/cluster", - "github.com/lxc/lxd/lxd/db/query", - "github.com/lxc/lxd/shared/api", + "github.com/canonical/lxd/lxd/db/cluster", + "github.com/canonical/lxd/lxd/db/query", + "github.com/canonical/lxd/shared/api", } diff --git a/lxd/db/generate/db/lex.go b/lxd/db/generate/db/lex.go index 7b435b651e09..c6c6cb60a2f1 100644 --- a/lxd/db/generate/db/lex.go +++ b/lxd/db/generate/db/lex.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/lex" ) // Return the table name for the given database entity. diff --git a/lxd/db/generate/db/mapping.go b/lxd/db/generate/db/mapping.go index 3ec0324ff50b..646c921c7156 100644 --- a/lxd/db/generate/db/mapping.go +++ b/lxd/db/generate/db/mapping.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/lxc/lxd/lxd/db/generate/lex" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/shared" ) // Mapping holds information for mapping database tables to a Go structure. diff --git a/lxd/db/generate/db/method.go b/lxd/db/generate/db/method.go index 810c06708961..dc372ae2f009 100644 --- a/lxd/db/generate/db/method.go +++ b/lxd/db/generate/db/method.go @@ -5,8 +5,8 @@ import ( "go/ast" "strings" - "github.com/lxc/lxd/lxd/db/generate/file" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/file" + "github.com/canonical/lxd/lxd/db/generate/lex" ) // Method generates a code snippet for a particular database query method. diff --git a/lxd/db/generate/db/parse.go b/lxd/db/generate/db/parse.go index 551e60c8dce1..cb107003b4e1 100644 --- a/lxd/db/generate/db/parse.go +++ b/lxd/db/generate/db/parse.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "github.com/lxc/lxd/lxd/db/generate/lex" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/shared" ) // Packages returns the the AST packages in which to search for structs. diff --git a/lxd/db/generate/db/parse_test.go b/lxd/db/generate/db/parse_test.go index 2303cacacb9a..6405f30f9fc3 100644 --- a/lxd/db/generate/db/parse_test.go +++ b/lxd/db/generate/db/parse_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db/generate/db" + "github.com/canonical/lxd/lxd/db/generate/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/generate/db/schema.go b/lxd/db/generate/db/schema.go index 63ff86046f7e..f10ed9989d43 100644 --- a/lxd/db/generate/db/schema.go +++ b/lxd/db/generate/db/schema.go @@ -3,8 +3,8 @@ package db import ( "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/node" ) // UpdateSchema updates the schema.go file of the cluster and node databases. diff --git a/lxd/db/generate/db/stmt.go b/lxd/db/generate/db/stmt.go index 1e02b4037159..698b4f648914 100644 --- a/lxd/db/generate/db/stmt.go +++ b/lxd/db/generate/db/stmt.go @@ -5,8 +5,8 @@ import ( "go/ast" "strings" - "github.com/lxc/lxd/lxd/db/generate/file" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/file" + "github.com/canonical/lxd/lxd/db/generate/lex" ) // Stmt generates a particular database query statement. diff --git a/lxd/db/generate/lex/parse.go b/lxd/db/generate/lex/parse.go index e893eefbb7a1..38ac47c537d4 100644 --- a/lxd/db/generate/lex/parse.go +++ b/lxd/db/generate/lex/parse.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Parse runs the Go parser against the given package directory. diff --git a/lxd/db/generate/lex/parse_test.go b/lxd/db/generate/lex/parse_test.go index b59ae6e175d8..0526af1c5de4 100644 --- a/lxd/db/generate/lex/parse_test.go +++ b/lxd/db/generate/lex/parse_test.go @@ -5,7 +5,7 @@ import ( "runtime" "testing" - "github.com/lxc/lxd/lxd/db/generate/lex" + "github.com/canonical/lxd/lxd/db/generate/lex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/images.go b/lxd/db/images.go index 79ceeb31ffb3..7bb4663fca69 100644 --- a/lxd/db/images.go +++ b/lxd/db/images.go @@ -11,10 +11,10 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // Code generation directives. diff --git a/lxd/db/images.mapper.go b/lxd/db/images.mapper.go index 02c538ceea89..d1ac57217a9d 100644 --- a/lxd/db/images.mapper.go +++ b/lxd/db/images.mapper.go @@ -9,10 +9,10 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/images_test.go b/lxd/db/images_test.go index 344d7366980e..1e6d0c75b989 100644 --- a/lxd/db/images_test.go +++ b/lxd/db/images_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/instance_profiles.mapper.go b/lxd/db/instance_profiles.mapper.go index a85b4f4ca33c..8fbdc7ccaf88 100644 --- a/lxd/db/instance_profiles.mapper.go +++ b/lxd/db/instance_profiles.mapper.go @@ -8,9 +8,9 @@ package db import ( "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/instances.go b/lxd/db/instances.go index e7b675cf3d0f..1e2316237758 100644 --- a/lxd/db/instances.go +++ b/lxd/db/instances.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/db/query" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" "github.com/pkg/errors" ) diff --git a/lxd/db/instances.mapper.go b/lxd/db/instances.mapper.go index 870d12ea8ce6..22fbc70f060a 100644 --- a/lxd/db/instances.mapper.go +++ b/lxd/db/instances.mapper.go @@ -9,10 +9,10 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/instances_test.go b/lxd/db/instances_test.go index 8a39d568acb2..699c5a10a1a8 100644 --- a/lxd/db/instances_test.go +++ b/lxd/db/instances_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/project" + "github.com/canonical/lxd/lxd/project" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared/api" ) func TestContainerList(t *testing.T) { diff --git a/lxd/db/legacy.go b/lxd/db/legacy.go index c91504f93756..44f0c9863fb4 100644 --- a/lxd/db/legacy.go +++ b/lxd/db/legacy.go @@ -6,7 +6,7 @@ package db import ( "database/sql" - "github.com/lxc/lxd/lxd/db/schema" + "github.com/canonical/lxd/lxd/db/schema" ) // LegacyPatch is a "database" update that performs non-database work. They diff --git a/lxd/db/migration.go b/lxd/db/migration.go index 0df5d18936bb..35d03bd1d356 100644 --- a/lxd/db/migration.go +++ b/lxd/db/migration.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" "github.com/pkg/errors" ) diff --git a/lxd/db/migration_test.go b/lxd/db/migration_test.go index 3aebd8105ce1..656afd81299e 100644 --- a/lxd/db/migration_test.go +++ b/lxd/db/migration_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/canonical/go-dqlite/driver" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/networks.go b/lxd/db/networks.go index 97701e9c04e1..0ab7aeeb7a56 100644 --- a/lxd/db/networks.go +++ b/lxd/db/networks.go @@ -10,10 +10,10 @@ import ( "net/http" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) // GetNetworksLocalConfig returns a map associating each network name to its diff --git a/lxd/db/networks_test.go b/lxd/db/networks_test.go index ce5957be4f4c..8509f7018f25 100644 --- a/lxd/db/networks_test.go +++ b/lxd/db/networks_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/node.go b/lxd/db/node.go index 0a7416da583d..f4e8053cac71 100644 --- a/lxd/db/node.go +++ b/lxd/db/node.go @@ -11,13 +11,13 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" ) // ClusterRole represents the role of a member in a cluster. diff --git a/lxd/db/node/open.go b/lxd/db/node/open.go index b49bed19617e..9bd185e00ee4 100644 --- a/lxd/db/node/open.go +++ b/lxd/db/node/open.go @@ -5,9 +5,9 @@ import ( "fmt" "path/filepath" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Open the node-local database object. diff --git a/lxd/db/node/open_test.go b/lxd/db/node/open_test.go index 16104044287b..dd3aebabe2de 100644 --- a/lxd/db/node/open_test.go +++ b/lxd/db/node/open_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/lxc/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/node" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/node/update.go b/lxd/db/node/update.go index 762529cf9bed..03b7014ad6f2 100644 --- a/lxd/db/node/update.go +++ b/lxd/db/node/update.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/units" ) // Schema for the local database. diff --git a/lxd/db/node/update_test.go b/lxd/db/node/update_test.go index 6f204fb2913a..21984e69b417 100644 --- a/lxd/db/node/update_test.go +++ b/lxd/db/node/update_test.go @@ -4,9 +4,9 @@ import ( "database/sql" "testing" - "github.com/lxc/lxd/lxd/db/node" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/node" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/node_test.go b/lxd/db/node_test.go index f2fe6cbc06b5..666913fe62c4 100644 --- a/lxd/db/node_test.go +++ b/lxd/db/node_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/operations.go b/lxd/db/operations.go index 2521be648b2d..783b998072eb 100644 --- a/lxd/db/operations.go +++ b/lxd/db/operations.go @@ -4,7 +4,7 @@ package db import ( - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" ) //go:generate -command mapper lxd-generate db mapper -t operations.mapper.go diff --git a/lxd/db/operations.mapper.go b/lxd/db/operations.mapper.go index 237e08fbd00d..abd03d8b74e8 100644 --- a/lxd/db/operations.mapper.go +++ b/lxd/db/operations.mapper.go @@ -9,9 +9,9 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/operations_test.go b/lxd/db/operations_test.go index 71b223d3df7f..03d83c91b4be 100644 --- a/lxd/db/operations_test.go +++ b/lxd/db/operations_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/patches.go b/lxd/db/patches.go index 687dc2bf4966..6933e13f72fe 100644 --- a/lxd/db/patches.go +++ b/lxd/db/patches.go @@ -6,7 +6,7 @@ package db import ( "database/sql" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" ) // GetAppliedPatches returns the names of all patches currently applied on this node. diff --git a/lxd/db/profiles.go b/lxd/db/profiles.go index 357f1de281bb..2c9dbd3a49ec 100644 --- a/lxd/db/profiles.go +++ b/lxd/db/profiles.go @@ -6,8 +6,8 @@ package db import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/shared/api" "github.com/pkg/errors" ) diff --git a/lxd/db/profiles.mapper.go b/lxd/db/profiles.mapper.go index c174b9fce657..a8a2fc750ac8 100644 --- a/lxd/db/profiles.mapper.go +++ b/lxd/db/profiles.mapper.go @@ -9,10 +9,10 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/projects.go b/lxd/db/projects.go index 49aba3605a55..1c8f3e557202 100644 --- a/lxd/db/projects.go +++ b/lxd/db/projects.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Code generation directives. diff --git a/lxd/db/projects.mapper.go b/lxd/db/projects.mapper.go index b9e825d3bb1e..885250a96a45 100644 --- a/lxd/db/projects.mapper.go +++ b/lxd/db/projects.mapper.go @@ -9,10 +9,10 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/projects_test.go b/lxd/db/projects_test.go index d0bd96563096..b5f53c5d82cb 100644 --- a/lxd/db/projects_test.go +++ b/lxd/db/projects_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/config_test.go b/lxd/db/query/config_test.go index d77026d172ff..182d15db1c77 100644 --- a/lxd/db/query/config_test.go +++ b/lxd/db/query/config_test.go @@ -4,7 +4,7 @@ import ( "database/sql" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/count_test.go b/lxd/db/query/count_test.go index 997dc44cd3fe..99f94f5c4ab2 100644 --- a/lxd/db/query/count_test.go +++ b/lxd/db/query/count_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/dump_test.go b/lxd/db/query/dump_test.go index 3f6c4a676a35..28baaf67097b 100644 --- a/lxd/db/query/dump_test.go +++ b/lxd/db/query/dump_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/objects_test.go b/lxd/db/query/objects_test.go index 859c090dca84..d89737c807f1 100644 --- a/lxd/db/query/objects_test.go +++ b/lxd/db/query/objects_test.go @@ -4,7 +4,7 @@ import ( "database/sql" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/query/retry.go b/lxd/db/query/retry.go index b847ddb8c5c3..3bf4d81c121a 100644 --- a/lxd/db/query/retry.go +++ b/lxd/db/query/retry.go @@ -10,7 +10,7 @@ import ( "github.com/mattn/go-sqlite3" "github.com/pkg/errors" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) const maxRetries = 250 diff --git a/lxd/db/query/slices_test.go b/lxd/db/query/slices_test.go index 88877e8fa232..7023a8714c1d 100644 --- a/lxd/db/query/slices_test.go +++ b/lxd/db/query/slices_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" ) // Exercise possible failure modes. diff --git a/lxd/db/query/transaction.go b/lxd/db/query/transaction.go index beb1109b667d..07af9e017437 100644 --- a/lxd/db/query/transaction.go +++ b/lxd/db/query/transaction.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" "github.com/pkg/errors" ) diff --git a/lxd/db/query/transaction_test.go b/lxd/db/query/transaction_test.go index 8b73b15d135b..b946cb50e53b 100644 --- a/lxd/db/query/transaction_test.go +++ b/lxd/db/query/transaction_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/stretchr/testify/assert" ) diff --git a/lxd/db/raft.go b/lxd/db/raft.go index f183a83aba34..a561c27526e7 100644 --- a/lxd/db/raft.go +++ b/lxd/db/raft.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/canonical/go-dqlite/client" - "github.com/lxc/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/query" "github.com/pkg/errors" ) diff --git a/lxd/db/raft_test.go b/lxd/db/raft_test.go index 6ef5a426bf43..0e30f3cef68d 100644 --- a/lxd/db/raft_test.go +++ b/lxd/db/raft_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) // Fetch all raft nodes. diff --git a/lxd/db/schema/query.go b/lxd/db/schema/query.go index f0e1eed8f0d4..359f23191b5f 100644 --- a/lxd/db/schema/query.go +++ b/lxd/db/schema/query.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "os" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" "github.com/pkg/errors" ) diff --git a/lxd/db/schema/schema.go b/lxd/db/schema/schema.go index 2ada3d2c5b86..d8ade7b810cb 100644 --- a/lxd/db/schema/schema.go +++ b/lxd/db/schema/schema.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" "github.com/pkg/errors" ) diff --git a/lxd/db/schema/schema_test.go b/lxd/db/schema/schema_test.go index 752de4f14ed0..208b9ba28f15 100644 --- a/lxd/db/schema/schema_test.go +++ b/lxd/db/schema/schema_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" ) // WriteTempFile creates a temp file with the specified content diff --git a/lxd/db/schema/update_test.go b/lxd/db/schema/update_test.go index 8e3449a02306..fdacbcc0c96b 100644 --- a/lxd/db/schema/update_test.go +++ b/lxd/db/schema/update_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db/schema" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/schema" + "github.com/canonical/lxd/shared" ) // A Go source file matching the given prefix is created in the calling diff --git a/lxd/db/snapshots.go b/lxd/db/snapshots.go index 2d1b63a2f5a3..aaea10aff36e 100644 --- a/lxd/db/snapshots.go +++ b/lxd/db/snapshots.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Code generation directives. diff --git a/lxd/db/snapshots.mapper.go b/lxd/db/snapshots.mapper.go index 47ab1fe083dd..3b47067f93ae 100644 --- a/lxd/db/snapshots.mapper.go +++ b/lxd/db/snapshots.mapper.go @@ -9,9 +9,9 @@ import ( "database/sql" "fmt" - "github.com/lxc/lxd/lxd/db/cluster" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/cluster" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared/api" ) var _ = api.ServerEnvironment{} diff --git a/lxd/db/snapshots_test.go b/lxd/db/snapshots_test.go index 42a71ae56d65..878eeaa5b2fa 100644 --- a/lxd/db/snapshots_test.go +++ b/lxd/db/snapshots_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance/instancetype" ) func TestGetInstanceSnapshots(t *testing.T) { diff --git a/lxd/db/storage_pools.go b/lxd/db/storage_pools.go index 19f23b1f69db..3581989eed70 100644 --- a/lxd/db/storage_pools.go +++ b/lxd/db/storage_pools.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // GetStoragePoolsLocalConfig returns a map associating each storage pool name to diff --git a/lxd/db/storage_pools_export_test.go b/lxd/db/storage_pools_export_test.go index e276f5ef9ecb..01421594c59b 100644 --- a/lxd/db/storage_pools_export_test.go +++ b/lxd/db/storage_pools_export_test.go @@ -3,7 +3,7 @@ package db -import "github.com/lxc/lxd/shared/api" +import "github.com/canonical/lxd/shared/api" func (c *Cluster) GetStoragePoolVolume(project string, volumeName string, volumeType int, poolID, nodeID int64) (int64, *api.StorageVolume, error) { return c.storagePoolVolumeGetType(project, volumeName, volumeType, poolID, nodeID) diff --git a/lxd/db/storage_pools_test.go b/lxd/db/storage_pools_test.go index cb6d12608011..6b771e89b9a2 100644 --- a/lxd/db/storage_pools_test.go +++ b/lxd/db/storage_pools_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/db/storage_volume_snapshots.go b/lxd/db/storage_volume_snapshots.go index 4bd8ef9f4c02..0dc92aebeab7 100644 --- a/lxd/db/storage_volume_snapshots.go +++ b/lxd/db/storage_volume_snapshots.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" ) // CreateStorageVolumeSnapshot creates a new storage volume snapshot attached to a given diff --git a/lxd/db/storage_volumes.go b/lxd/db/storage_volumes.go index 47622739107b..9cc5302b4297 100644 --- a/lxd/db/storage_volumes.go +++ b/lxd/db/storage_volumes.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" "github.com/pkg/errors" ) diff --git a/lxd/db/storage_volumes_test.go b/lxd/db/storage_volumes_test.go index f13b94a9a3c7..d9735aa970ae 100644 --- a/lxd/db/storage_volumes_test.go +++ b/lxd/db/storage_volumes_test.go @@ -6,7 +6,7 @@ package db_test import ( "testing" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/device/config/device_runconfig.go b/lxd/device/config/device_runconfig.go index 7b1ae324956b..d0f450db97ff 100644 --- a/lxd/device/config/device_runconfig.go +++ b/lxd/device/config/device_runconfig.go @@ -1,6 +1,6 @@ package config -import "github.com/lxc/lxd/lxd/revert" +import "github.com/canonical/lxd/lxd/revert" // MountOwnerShiftNone do not use owner shifting. const MountOwnerShiftNone = "" diff --git a/lxd/device/device_common.go b/lxd/device/device_common.go index 072c562711fa..44e92ecefa51 100644 --- a/lxd/device/device_common.go +++ b/lxd/device/device_common.go @@ -3,12 +3,12 @@ package device import ( log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) // deviceCommon represents the common struct for all devices. diff --git a/lxd/device/device_interface.go b/lxd/device/device_interface.go index a37428e5c29b..2c88547404ab 100644 --- a/lxd/device/device_interface.go +++ b/lxd/device/device_interface.go @@ -1,10 +1,10 @@ package device import ( - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/api" ) // VolatileSetter is a function that accepts one or more key/value strings to save into the LXD diff --git a/lxd/device/device_load.go b/lxd/device/device_load.go index 3051badcdd2a..8e1ff4736788 100644 --- a/lxd/device/device_load.go +++ b/lxd/device/device_load.go @@ -5,10 +5,10 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" ) // newByType returns a new unitialised device based of the type indicated by the project and device config. diff --git a/lxd/device/device_utils_disk.go b/lxd/device/device_utils_disk.go index ba180d88ba4c..cab589fe4824 100644 --- a/lxd/device/device_utils_disk.go +++ b/lxd/device/device_utils_disk.go @@ -11,13 +11,13 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/revert" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/subprocess" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/revert" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/subprocess" ) // BlockFsDetect detects the type of block device. diff --git a/lxd/device/device_utils_generic.go b/lxd/device/device_utils_generic.go index 66f170179a35..03be28dcb232 100644 --- a/lxd/device/device_utils_generic.go +++ b/lxd/device/device_utils_generic.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // deviceJoinPath joins together prefix and text delimited by a "." for device path generation. diff --git a/lxd/device/device_utils_gpu.go b/lxd/device/device_utils_gpu.go index c2452cca8050..2d7fb98ac3f2 100644 --- a/lxd/device/device_utils_gpu.go +++ b/lxd/device/device_utils_gpu.go @@ -1,7 +1,7 @@ package device import ( - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/shared/validate" "strings" ) diff --git a/lxd/device/device_utils_infiniband.go b/lxd/device/device_utils_infiniband.go index 7d9f3adf2b93..8583567549a5 100644 --- a/lxd/device/device_utils_infiniband.go +++ b/lxd/device/device_utils_infiniband.go @@ -5,9 +5,9 @@ import ( "net" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/api" ) // IBDevPrefix Infiniband devices prefix. diff --git a/lxd/device/device_utils_instance.go b/lxd/device/device_utils_instance.go index f9bff3c229b6..9bb6a7c4c178 100644 --- a/lxd/device/device_utils_instance.go +++ b/lxd/device/device_utils_instance.go @@ -1,7 +1,7 @@ package device import ( - "github.com/lxc/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/instancetype" ) // instanceSupported is a helper function to check instance type is supported for validation. diff --git a/lxd/device/device_utils_network.go b/lxd/device/device_utils_network.go index b4333376b703..e2a2dd0c8e6b 100644 --- a/lxd/device/device_utils_network.go +++ b/lxd/device/device_utils_network.go @@ -13,17 +13,17 @@ import ( "github.com/mdlayher/ndp" "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/units" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/units" ) // Instances can be started in parallel, so lock the creation of VLANs. diff --git a/lxd/device/device_utils_proxy.go b/lxd/device/device_utils_proxy.go index 48ce5db4d92d..2cb165101b7e 100644 --- a/lxd/device/device_utils_proxy.go +++ b/lxd/device/device_utils_proxy.go @@ -5,10 +5,10 @@ import ( "net" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // ProxyParseAddr validates a proxy address and parses it into its constituent parts. diff --git a/lxd/device/device_utils_unix.go b/lxd/device/device_utils_unix.go index 756f8b33dcd0..501c8de9d185 100644 --- a/lxd/device/device_utils_unix.go +++ b/lxd/device/device_utils_unix.go @@ -10,12 +10,12 @@ import ( "golang.org/x/sys/unix" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/state" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/state" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) // unixDefaultMode default mode to create unix devices with if not specified in device config. diff --git a/lxd/device/device_utils_unix_events.go b/lxd/device/device_utils_unix_events.go index a64383c28beb..4870864124ef 100644 --- a/lxd/device/device_utils_unix_events.go +++ b/lxd/device/device_utils_unix_events.go @@ -8,11 +8,11 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // UnixEvent represents the properties of a Unix device inotify event. diff --git a/lxd/device/device_utils_unix_hotplug_events.go b/lxd/device/device_utils_unix_hotplug_events.go index ce0e44631d6f..3376117f6ed6 100644 --- a/lxd/device/device_utils_unix_hotplug_events.go +++ b/lxd/device/device_utils_unix_hotplug_events.go @@ -8,10 +8,10 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" ) // UnixHotplugEvent represents the properties of a Unix hotplug device uevent. diff --git a/lxd/device/device_utils_usb_events.go b/lxd/device/device_utils_usb_events.go index 26ee8f584f3a..69eab5319f99 100644 --- a/lxd/device/device_utils_usb_events.go +++ b/lxd/device/device_utils_usb_events.go @@ -9,10 +9,10 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" ) // USBEvent represents the properties of a USB device uevent. diff --git a/lxd/device/disk.go b/lxd/device/disk.go index 007543400da6..26a3b45f3868 100644 --- a/lxd/device/disk.go +++ b/lxd/device/disk.go @@ -14,22 +14,22 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // Special disk "source" value used for generating a VM cloud-init config ISO. diff --git a/lxd/device/gpu.go b/lxd/device/gpu.go index 72540f32aab4..b29aec4a632a 100644 --- a/lxd/device/gpu.go +++ b/lxd/device/gpu.go @@ -1,6 +1,6 @@ package device -import "github.com/lxc/lxd/shared/validate" +import "github.com/canonical/lxd/shared/validate" func gpuValidationRules(requiredFields []string, optionalFields []string) map[string]func(value string) error { // Define a set of default validators for each field name. diff --git a/lxd/device/gpu_mdev.go b/lxd/device/gpu_mdev.go index 554a1f5609fe..f4beb96a9387 100644 --- a/lxd/device/gpu_mdev.go +++ b/lxd/device/gpu_mdev.go @@ -10,13 +10,13 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" ) type gpuMdev struct { diff --git a/lxd/device/gpu_mig.go b/lxd/device/gpu_mig.go index 00de4fb1f318..f512518ec119 100644 --- a/lxd/device/gpu_mig.go +++ b/lxd/device/gpu_mig.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) type gpuMIG struct { diff --git a/lxd/device/gpu_physical.go b/lxd/device/gpu_physical.go index 34a7aa82103a..1e8fd1f2f4a3 100644 --- a/lxd/device/gpu_physical.go +++ b/lxd/device/gpu_physical.go @@ -12,13 +12,13 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) const gpuDRIDevPath = "/dev/dri" diff --git a/lxd/device/gpu_sriov.go b/lxd/device/gpu_sriov.go index eaf89a3305ea..c699e5f4736f 100644 --- a/lxd/device/gpu_sriov.go +++ b/lxd/device/gpu_sriov.go @@ -9,14 +9,14 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) type gpuSRIOV struct { diff --git a/lxd/device/infiniband_physical.go b/lxd/device/infiniband_physical.go index 9cc41eefb314..6283a675460c 100644 --- a/lxd/device/infiniband_physical.go +++ b/lxd/device/infiniband_physical.go @@ -5,12 +5,12 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/shared" ) type infinibandPhysical struct { diff --git a/lxd/device/infiniband_sriov.go b/lxd/device/infiniband_sriov.go index e2b5c8f0aa4b..27c27bd38070 100644 --- a/lxd/device/infiniband_sriov.go +++ b/lxd/device/infiniband_sriov.go @@ -5,14 +5,14 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) type infinibandSRIOV struct { diff --git a/lxd/device/nic.go b/lxd/device/nic.go index fb4ff9d1c1e1..3522816d6441 100644 --- a/lxd/device/nic.go +++ b/lxd/device/nic.go @@ -3,9 +3,9 @@ package device import ( "fmt" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // nicValidationRules returns config validation rules for nic devices. diff --git a/lxd/device/nic_bridged.go b/lxd/device/nic_bridged.go index 8c9f237c8d17..de0074cce6ac 100644 --- a/lxd/device/nic_bridged.go +++ b/lxd/device/nic_bridged.go @@ -18,21 +18,21 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/dnsmasq" - "github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc" - firewallDrivers "github.com/lxc/lxd/lxd/firewall/drivers" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/dnsmasq" + "github.com/canonical/lxd/lxd/dnsmasq/dhcpalloc" + firewallDrivers "github.com/canonical/lxd/lxd/firewall/drivers" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) type bridgeNetwork interface { diff --git a/lxd/device/nic_ipvlan.go b/lxd/device/nic_ipvlan.go index 0d4e39c2159d..6a345bb96ac7 100644 --- a/lxd/device/nic_ipvlan.go +++ b/lxd/device/nic_ipvlan.go @@ -4,14 +4,14 @@ import ( "fmt" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" "github.com/pkg/errors" ) diff --git a/lxd/device/nic_macvlan.go b/lxd/device/nic_macvlan.go index 78798d89f5e7..aad32f3a065e 100644 --- a/lxd/device/nic_macvlan.go +++ b/lxd/device/nic_macvlan.go @@ -5,13 +5,13 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" ) type nicMACVLAN struct { diff --git a/lxd/device/nic_p2p.go b/lxd/device/nic_p2p.go index 851d923e1d89..b171216fd473 100644 --- a/lxd/device/nic_p2p.go +++ b/lxd/device/nic_p2p.go @@ -3,12 +3,12 @@ package device import ( "fmt" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" ) type nicP2P struct { diff --git a/lxd/device/nic_physical.go b/lxd/device/nic_physical.go index f028e199d9f7..c40878294cb5 100644 --- a/lxd/device/nic_physical.go +++ b/lxd/device/nic_physical.go @@ -5,15 +5,15 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - pcidev "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + pcidev "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) type nicPhysical struct { diff --git a/lxd/device/nic_routed.go b/lxd/device/nic_routed.go index f10e5cae61f7..dc70aa259b8b 100644 --- a/lxd/device/nic_routed.go +++ b/lxd/device/nic_routed.go @@ -10,15 +10,15 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) var nicRoutedIPGateway = map[string]string{ diff --git a/lxd/device/nic_sriov.go b/lxd/device/nic_sriov.go index 31e89eb1ef20..1c89056a4c1e 100644 --- a/lxd/device/nic_sriov.go +++ b/lxd/device/nic_sriov.go @@ -5,12 +5,12 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) type nicSRIOV struct { diff --git a/lxd/device/nictype/nictype.go b/lxd/device/nictype/nictype.go index 410b56678bcb..859bc543ffa0 100644 --- a/lxd/device/nictype/nictype.go +++ b/lxd/device/nictype/nictype.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/state" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/state" ) // NICType resolves the NIC Type for the supplied NIC device config. diff --git a/lxd/device/none.go b/lxd/device/none.go index 5fa3f08b4963..910560732a01 100644 --- a/lxd/device/none.go +++ b/lxd/device/none.go @@ -1,8 +1,8 @@ package device import ( - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" ) type none struct { diff --git a/lxd/device/pci/pci.go b/lxd/device/pci/pci.go index 16046cedbc3e..4f16eb871a57 100644 --- a/lxd/device/pci/pci.go +++ b/lxd/device/pci/pci.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" ) // Device represents info about a PCI uevent device. diff --git a/lxd/device/pci/pci_test.go b/lxd/device/pci/pci_test.go index 0d0e0de61dc6..8839c5585119 100644 --- a/lxd/device/pci/pci_test.go +++ b/lxd/device/pci/pci_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/lxc/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/device/pci" ) func TestNormaliseAddress(t *testing.T) { diff --git a/lxd/device/proxy.go b/lxd/device/proxy.go index cf295777a3c1..d421c733e0e5 100644 --- a/lxd/device/proxy.go +++ b/lxd/device/proxy.go @@ -13,19 +13,19 @@ import ( "github.com/pkg/errors" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/lxd/apparmor" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - firewallDrivers "github.com/lxc/lxd/lxd/firewall/drivers" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/subprocess" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/apparmor" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + firewallDrivers "github.com/canonical/lxd/lxd/firewall/drivers" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/subprocess" + "github.com/canonical/lxd/shared/validate" ) type proxy struct { diff --git a/lxd/device/unix_common.go b/lxd/device/unix_common.go index 003614ad4607..def4e03be22c 100644 --- a/lxd/device/unix_common.go +++ b/lxd/device/unix_common.go @@ -5,13 +5,13 @@ import ( "path/filepath" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/fsmonitor/drivers" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/fsmonitor/drivers" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // unixIsOurDeviceType checks that device file type matches what we are expecting in the config. diff --git a/lxd/device/unix_hotplug.go b/lxd/device/unix_hotplug.go index 290f19c7466c..63ef6f29fcbc 100644 --- a/lxd/device/unix_hotplug.go +++ b/lxd/device/unix_hotplug.go @@ -9,11 +9,11 @@ import ( udev "github.com/jochenvg/go-udev" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // unixHotplugIsOurDevice indicates whether the unixHotplug device event qualifies as part of our device. diff --git a/lxd/device/usb.go b/lxd/device/usb.go index 55d3816720d6..b509b1ce0a7e 100644 --- a/lxd/device/usb.go +++ b/lxd/device/usb.go @@ -7,12 +7,12 @@ import ( "path" "strings" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/validate" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/validate" ) // usbDevPath is the path where USB devices can be enumerated. diff --git a/lxd/devices.go b/lxd/devices.go index e8dbd24253b4..4215ef7b4f25 100644 --- a/lxd/devices.go +++ b/lxd/devices.go @@ -13,16 +13,16 @@ import ( log "gopkg.in/inconshreveable/log15.v2" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" - - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/device" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + _ "github.com/canonical/lxd/lxd/include" + + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/device" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) /* diff --git a/lxd/devlxd.go b/lxd/devlxd.go index f50bc082aab7..5f9990233f0a 100644 --- a/lxd/devlxd.go +++ b/lxd/devlxd.go @@ -14,17 +14,17 @@ import ( "github.com/gorilla/mux" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/ucred" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/ucred" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // DevLxdServer creates an http.Server capable of handling requests against the diff --git a/lxd/devlxd_test.go b/lxd/devlxd_test.go index 1745d6c14fb6..3ebae82fdec9 100644 --- a/lxd/devlxd_test.go +++ b/lxd/devlxd_test.go @@ -13,8 +13,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/ucred" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/ucred" ) var testDir string diff --git a/lxd/dnsmasq/dhcpalloc/dhcpalloc.go b/lxd/dnsmasq/dhcpalloc/dhcpalloc.go index ffd22d85cb17..1ba8e376b39d 100644 --- a/lxd/dnsmasq/dhcpalloc/dhcpalloc.go +++ b/lxd/dnsmasq/dhcpalloc/dhcpalloc.go @@ -13,10 +13,10 @@ import ( "github.com/mdlayher/netx/eui64" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/dnsmasq" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/dnsmasq" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) // ErrDHCPNotSupported indicates network doesn't support DHCP for this IP protocol. diff --git a/lxd/dnsmasq/dnsmasq.go b/lxd/dnsmasq/dnsmasq.go index 593848efd80a..cf15a66e9bc3 100644 --- a/lxd/dnsmasq/dnsmasq.go +++ b/lxd/dnsmasq/dnsmasq.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/subprocess" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/subprocess" + "github.com/canonical/lxd/shared/version" ) // DHCPAllocation represents an IP allocation from dnsmasq. diff --git a/lxd/endpoints/cluster.go b/lxd/endpoints/cluster.go index 8e6c2cea8ed0..007bff31326a 100644 --- a/lxd/endpoints/cluster.go +++ b/lxd/endpoints/cluster.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/lxc/lxd/lxd/endpoints/listeners" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/endpoints/listeners" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // ClusterAddress returns the cluster addresss of the cluster endpoint, or an diff --git a/lxd/endpoints/devlxd_test.go b/lxd/endpoints/devlxd_test.go index f92c0bbf2cdf..43c16e2ec2d8 100644 --- a/lxd/endpoints/devlxd_test.go +++ b/lxd/endpoints/devlxd_test.go @@ -3,7 +3,7 @@ package endpoints_test import ( "testing" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/endpoints/endpoints.go b/lxd/endpoints/endpoints.go index f051e7feb701..36b6b0de5c44 100644 --- a/lxd/endpoints/endpoints.go +++ b/lxd/endpoints/endpoints.go @@ -9,10 +9,10 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/endpoints/listeners" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/endpoints/listeners" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" tomb "gopkg.in/tomb.v2" ) diff --git a/lxd/endpoints/endpoints_exported_test.go b/lxd/endpoints/endpoints_exported_test.go index cc4802fee881..4d13a4dfeda6 100644 --- a/lxd/endpoints/endpoints_exported_test.go +++ b/lxd/endpoints/endpoints_exported_test.go @@ -1,8 +1,8 @@ package endpoints import ( - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // New creates a new Endpoints instance without bringing it up. diff --git a/lxd/endpoints/endpoints_test.go b/lxd/endpoints/endpoints_test.go index 4fcb7fbef34c..146dd16f20a3 100644 --- a/lxd/endpoints/endpoints_test.go +++ b/lxd/endpoints/endpoints_test.go @@ -12,11 +12,11 @@ import ( "strconv" "testing" - "github.com/lxc/lxd/lxd/endpoints" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/endpoints" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/endpoints/listeners/fancytls.go b/lxd/endpoints/listeners/fancytls.go index 85765dc074c0..c68a0a1effa4 100644 --- a/lxd/endpoints/listeners/fancytls.go +++ b/lxd/endpoints/listeners/fancytls.go @@ -7,8 +7,8 @@ import ( "github.com/armon/go-proxyproto" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // FancyTLSListener is a variation of the standard tls.Listener that supports diff --git a/lxd/endpoints/listeners/starttls.go b/lxd/endpoints/listeners/starttls.go index 2df3056966d7..1b6149085b3c 100644 --- a/lxd/endpoints/listeners/starttls.go +++ b/lxd/endpoints/listeners/starttls.go @@ -7,8 +7,8 @@ import ( "net" "sync" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // StarttlsListener is a variation of the standard tls.Listener that supports diff --git a/lxd/endpoints/local_test.go b/lxd/endpoints/local_test.go index 57b34c19beb3..c06e5db54d13 100644 --- a/lxd/endpoints/local_test.go +++ b/lxd/endpoints/local_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/endpoints/network.go b/lxd/endpoints/network.go index e3a8eaa2b6f9..f4e867fff289 100644 --- a/lxd/endpoints/network.go +++ b/lxd/endpoints/network.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/endpoints/listeners" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/endpoints/listeners" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" "github.com/pkg/errors" ) diff --git a/lxd/endpoints/network_test.go b/lxd/endpoints/network_test.go index 7204420ad2ab..f792dfb7d16b 100644 --- a/lxd/endpoints/network_test.go +++ b/lxd/endpoints/network_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/endpoints/pprof.go b/lxd/endpoints/pprof.go index eb153606e8b3..57936a9bfb3f 100644 --- a/lxd/endpoints/pprof.go +++ b/lxd/endpoints/pprof.go @@ -6,9 +6,9 @@ import ( "net/http" "time" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" _ "net/http/pprof" // pprof magic ) diff --git a/lxd/endpoints/socket.go b/lxd/endpoints/socket.go index e7114c8f64e6..90fbba41f7af 100644 --- a/lxd/endpoints/socket.go +++ b/lxd/endpoints/socket.go @@ -10,9 +10,9 @@ import ( "os/user" "strconv" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Bind to the given unix socket path. diff --git a/lxd/events.go b/lxd/events.go index 6ffde803520c..5407febc0e83 100644 --- a/lxd/events.go +++ b/lxd/events.go @@ -6,11 +6,11 @@ import ( "net/http" "strings" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" ) var eventTypes = []string{"logging", "operation", "lifecycle"} diff --git a/lxd/events/common.go b/lxd/events/common.go index a8bc581bff4d..d998546325b1 100644 --- a/lxd/events/common.go +++ b/lxd/events/common.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/websocket" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // EventHandler called when the connection receives an event from the client. diff --git a/lxd/events/devlxdEvents.go b/lxd/events/devlxdEvents.go index eeffda7abc6e..d8674135eca2 100644 --- a/lxd/events/devlxdEvents.go +++ b/lxd/events/devlxdEvents.go @@ -9,8 +9,8 @@ import ( "github.com/pborman/uuid" "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // DevLXDServer represents an instance of an devlxd event server. diff --git a/lxd/events/events.go b/lxd/events/events.go index ffd3784664dc..b7c2ca0cf6be 100644 --- a/lxd/events/events.go +++ b/lxd/events/events.go @@ -9,9 +9,9 @@ import ( "github.com/pborman/uuid" "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // Server represents an instance of an event server. diff --git a/lxd/events/logging.go b/lxd/events/logging.go index 05f1e19815e5..f0f55fda7fc9 100644 --- a/lxd/events/logging.go +++ b/lxd/events/logging.go @@ -5,7 +5,7 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // LoggingServer controls what server to use for messages coming from the logger. diff --git a/lxd/filter/clause.go b/lxd/filter/clause.go index 4b6d0a836b13..951cc0f4f636 100644 --- a/lxd/filter/clause.go +++ b/lxd/filter/clause.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Clause is a single filter clause in a filter string. diff --git a/lxd/filter/clause_test.go b/lxd/filter/clause_test.go index 0cfa73f5f980..7da8ba6ce19d 100644 --- a/lxd/filter/clause_test.go +++ b/lxd/filter/clause_test.go @@ -3,7 +3,7 @@ package filter_test import ( "testing" - "github.com/lxc/lxd/lxd/filter" + "github.com/canonical/lxd/lxd/filter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/filter/match_test.go b/lxd/filter/match_test.go index cdd719cbe618..5de596104e3d 100644 --- a/lxd/filter/match_test.go +++ b/lxd/filter/match_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/filter/value_test.go b/lxd/filter/value_test.go index 96691155604f..137cb209e1c9 100644 --- a/lxd/filter/value_test.go +++ b/lxd/filter/value_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/shared/api" "github.com/stretchr/testify/assert" ) diff --git a/lxd/firewall/drivers/drivers_nftables.go b/lxd/firewall/drivers/drivers_nftables.go index e126606ec027..2670fdfbb778 100644 --- a/lxd/firewall/drivers/drivers_nftables.go +++ b/lxd/firewall/drivers/drivers_nftables.go @@ -13,9 +13,9 @@ import ( "github.com/pborman/uuid" "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) const nftablesNamespace = "lxd" diff --git a/lxd/firewall/drivers/drivers_xtables.go b/lxd/firewall/drivers/drivers_xtables.go index 096f99937ce4..3d5917e3d9f6 100644 --- a/lxd/firewall/drivers/drivers_xtables.go +++ b/lxd/firewall/drivers/drivers_xtables.go @@ -13,11 +13,11 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // iptablesChainNICFilterPrefix chain prefix used for NIC specific filtering rules. diff --git a/lxd/firewall/firewall_interface.go b/lxd/firewall/firewall_interface.go index b1df9bfd6d56..eb9443d3d258 100644 --- a/lxd/firewall/firewall_interface.go +++ b/lxd/firewall/firewall_interface.go @@ -3,7 +3,7 @@ package firewall import ( "net" - drivers "github.com/lxc/lxd/lxd/firewall/drivers" + drivers "github.com/canonical/lxd/lxd/firewall/drivers" ) // Firewall represents a LXD firewall. diff --git a/lxd/firewall/firewall_load.go b/lxd/firewall/firewall_load.go index ec332e703d7d..4c40c93c83c9 100644 --- a/lxd/firewall/firewall_load.go +++ b/lxd/firewall/firewall_load.go @@ -1,8 +1,8 @@ package firewall import ( - "github.com/lxc/lxd/lxd/firewall/drivers" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/firewall/drivers" + "github.com/canonical/lxd/shared/logger" ) // New returns an appropriate firewall implementation. diff --git a/lxd/fsmonitor/drivers/common.go b/lxd/fsmonitor/drivers/common.go index 7e086ca66ef8..345fb7bbd3c7 100644 --- a/lxd/fsmonitor/drivers/common.go +++ b/lxd/fsmonitor/drivers/common.go @@ -4,7 +4,7 @@ import ( "strings" "sync" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) type common struct { diff --git a/lxd/fsmonitor/drivers/driver_fsnotify.go b/lxd/fsmonitor/drivers/driver_fsnotify.go index f55354da7ac8..2b28d367ea3f 100644 --- a/lxd/fsmonitor/drivers/driver_fsnotify.go +++ b/lxd/fsmonitor/drivers/driver_fsnotify.go @@ -10,7 +10,7 @@ import ( fsn "github.com/fsnotify/fsnotify" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) var fsnotifyLoaded bool diff --git a/lxd/fsmonitor/drivers/interface.go b/lxd/fsmonitor/drivers/interface.go index 42b0e6f7a01f..3f5de1ddb0b2 100644 --- a/lxd/fsmonitor/drivers/interface.go +++ b/lxd/fsmonitor/drivers/interface.go @@ -3,7 +3,7 @@ package drivers import ( "context" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // driver is the extended internal interface. diff --git a/lxd/fsmonitor/drivers/load.go b/lxd/fsmonitor/drivers/load.go index 4511084c5074..f2e2123aaad5 100644 --- a/lxd/fsmonitor/drivers/load.go +++ b/lxd/fsmonitor/drivers/load.go @@ -3,7 +3,7 @@ package drivers import ( "context" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) var drivers = map[string]func() driver{ diff --git a/lxd/fsmonitor/fsmonitor.go b/lxd/fsmonitor/fsmonitor.go index 6d5277401411..acc95f6ef374 100644 --- a/lxd/fsmonitor/fsmonitor.go +++ b/lxd/fsmonitor/fsmonitor.go @@ -3,8 +3,8 @@ package fsmonitor import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/fsmonitor/drivers" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/fsmonitor/drivers" + "github.com/canonical/lxd/shared/logger" ) type fsMonitor struct { diff --git a/lxd/fsmonitor/load.go b/lxd/fsmonitor/load.go index 58826cbc0151..ac73b99c34d6 100644 --- a/lxd/fsmonitor/load.go +++ b/lxd/fsmonitor/load.go @@ -6,10 +6,10 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/fsmonitor/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/fsmonitor/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) // New creates a new FSMonitor instance. diff --git a/lxd/images.go b/lxd/images.go index fe7119cf2d5c..d31a1175ee9a 100644 --- a/lxd/images.go +++ b/lxd/images.go @@ -28,29 +28,29 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/operations" - projectutils "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/operations" + projectutils "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" ) var imagesCmd = APIEndpoint{ diff --git a/lxd/init.go b/lxd/init.go index 0c59258e5459..edc5dc24bcfa 100644 --- a/lxd/init.go +++ b/lxd/init.go @@ -5,10 +5,10 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) type initDataNode struct { diff --git a/lxd/instance.go b/lxd/instance.go index e540ae6f2646..2b292eecf892 100644 --- a/lxd/instance.go +++ b/lxd/instance.go @@ -11,18 +11,18 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // Helper functions diff --git a/lxd/instance/drivers/driver_common.go b/lxd/instance/drivers/driver_common.go index 89f36e23f449..8bd1c424d81d 100644 --- a/lxd/instance/drivers/driver_common.go +++ b/lxd/instance/drivers/driver_common.go @@ -11,24 +11,24 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/maas" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/maas" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // ErrInstanceIsStopped indicates that the instance is stopped. diff --git a/lxd/instance/drivers/driver_lxc.go b/lxd/instance/drivers/driver_lxc.go index b352265e810d..b6586c607c36 100644 --- a/lxd/instance/drivers/driver_lxc.go +++ b/lxd/instance/drivers/driver_lxc.go @@ -27,35 +27,35 @@ import ( liblxc "gopkg.in/lxc/go-lxc.v2" yaml "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/apparmor" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/seccomp" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/template" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/netutils" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/apparmor" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/seccomp" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/template" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/netutils" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/units" ) // Helper functions diff --git a/lxd/instance/drivers/driver_lxc_cmd.go b/lxd/instance/drivers/driver_lxc_cmd.go index ea21e705c04f..928a9ac9573b 100644 --- a/lxd/instance/drivers/driver_lxc_cmd.go +++ b/lxd/instance/drivers/driver_lxc_cmd.go @@ -5,8 +5,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // lxcCmd represents a running command for an LXC container. diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go index 34a9e9765f84..9933cfb11a84 100644 --- a/lxd/instance/drivers/driver_qemu.go +++ b/lxd/instance/drivers/driver_qemu.go @@ -29,38 +29,38 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/apparmor" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/drivers/qmp" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - pongoTemplate "github.com/lxc/lxd/lxd/template" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/lxd/vsock" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/subprocess" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/apparmor" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/drivers/qmp" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + pongoTemplate "github.com/canonical/lxd/lxd/template" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/lxd/vsock" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/subprocess" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/version" ) // qemuAsyncIO is used to indicate disk should use unsafe cache I/O. diff --git a/lxd/instance/drivers/driver_qemu_cmd.go b/lxd/instance/drivers/driver_qemu_cmd.go index 2259a65277c9..59359f7d8de5 100644 --- a/lxd/instance/drivers/driver_qemu_cmd.go +++ b/lxd/instance/drivers/driver_qemu_cmd.go @@ -6,9 +6,9 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // Cmd represents a running command for an Qemu VM. diff --git a/lxd/instance/drivers/load.go b/lxd/instance/drivers/load.go index 5ea03ce4aa28..7519e0f0ecd8 100644 --- a/lxd/instance/drivers/load.go +++ b/lxd/instance/drivers/load.go @@ -7,16 +7,16 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // Instance driver definitions. diff --git a/lxd/instance/drivers/qmp/commands.go b/lxd/instance/drivers/qmp/commands.go index 2da3bf9bc93d..85d7507b0429 100644 --- a/lxd/instance/drivers/qmp/commands.go +++ b/lxd/instance/drivers/qmp/commands.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" ) // Status returns the current VM status. diff --git a/lxd/instance/drivers/qmp/monitor.go b/lxd/instance/drivers/qmp/monitor.go index df6ab6c5e976..3f2171db34db 100644 --- a/lxd/instance/drivers/qmp/monitor.go +++ b/lxd/instance/drivers/qmp/monitor.go @@ -10,7 +10,7 @@ import ( "github.com/digitalocean/go-qemu/qmp" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) var monitors = map[string]*Monitor{} diff --git a/lxd/instance/drivers/test_util.go b/lxd/instance/drivers/test_util.go index 6ea131b9951d..5449fe696094 100644 --- a/lxd/instance/drivers/test_util.go +++ b/lxd/instance/drivers/test_util.go @@ -1,8 +1,8 @@ package drivers import ( - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" ) // PrepareEqualTest modifies any unexported variables required for reflect.DeepEqual to complete safely. diff --git a/lxd/instance/filter.go b/lxd/instance/filter.go index 495f6717b5fd..a5fab8bd3021 100644 --- a/lxd/instance/filter.go +++ b/lxd/instance/filter.go @@ -1,8 +1,8 @@ package instance import ( - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/shared/api" ) // Filter returns a filtered list of instances that match the given clauses. diff --git a/lxd/instance/instance_interface.go b/lxd/instance/instance_interface.go index bcf288354642..e59471263a4b 100644 --- a/lxd/instance/instance_interface.go +++ b/lxd/instance/instance_interface.go @@ -7,14 +7,14 @@ import ( liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" ) // HookStart hook used when instance has started. diff --git a/lxd/instance/instance_utils.go b/lxd/instance/instance_utils.go index 59c3a669c607..4a1f737f1977 100644 --- a/lxd/instance/instance_utils.go +++ b/lxd/instance/instance_utils.go @@ -17,24 +17,24 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/seccomp" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/seccomp" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/version" ) // ValidDevices is linked from instance/drivers.validDevices to validate device config. diff --git a/lxd/instance/instancetype/instance_type.go b/lxd/instance/instancetype/instance_type.go index 55a040086ab9..4b324da0b229 100644 --- a/lxd/instance/instancetype/instance_type.go +++ b/lxd/instance/instancetype/instance_type.go @@ -3,7 +3,7 @@ package instancetype import ( "fmt" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Type indicates the type of instance. diff --git a/lxd/instance/operationlock/operationlock.go b/lxd/instance/operationlock/operationlock.go index acd243dff37e..b598df6ca689 100644 --- a/lxd/instance/operationlock/operationlock.go +++ b/lxd/instance/operationlock/operationlock.go @@ -7,8 +7,8 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/logger" ) // TimeoutSeconds number of seconds that the operation lock will be kept for without calling Reset(). diff --git a/lxd/instance_backup.go b/lxd/instance_backup.go index dcab6036e621..116ba8a42b3a 100644 --- a/lxd/instance_backup.go +++ b/lxd/instance_backup.go @@ -10,17 +10,17 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) // swagger:operation GET /1.0/instances/{name}/backups instances instance_backups_get diff --git a/lxd/instance_console.go b/lxd/instance_console.go index 7955c0bebe9a..f57a9ee68e0e 100644 --- a/lxd/instance_console.go +++ b/lxd/instance_console.go @@ -14,17 +14,17 @@ import ( "golang.org/x/sys/unix" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/termios" ) type consoleWs struct { diff --git a/lxd/instance_delete.go b/lxd/instance_delete.go index d28248b890db..af63ee1a148a 100644 --- a/lxd/instance_delete.go +++ b/lxd/instance_delete.go @@ -5,11 +5,11 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" ) // swagger:operation DELETE /1.0/instances/{name} instances instance_delete diff --git a/lxd/instance_exec.go b/lxd/instance_exec.go index 9a2bb196e093..6708c4de5a23 100644 --- a/lxd/instance_exec.go +++ b/lxd/instance_exec.go @@ -18,19 +18,19 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/netutils" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/netutils" + "github.com/canonical/lxd/shared/version" ) const execWSControl = -1 diff --git a/lxd/instance_file.go b/lxd/instance_file.go index e1e266c2812b..d2621a7f6182 100644 --- a/lxd/instance_file.go +++ b/lxd/instance_file.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" ) func instanceFileHandler(d *Daemon, r *http.Request) response.Response { diff --git a/lxd/instance_get.go b/lxd/instance_get.go index 3af101c3bc49..1ffe9e95c559 100644 --- a/lxd/instance_get.go +++ b/lxd/instance_get.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/response" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/response" ) // swagger:operation GET /1.0/instances/{name} instances instance_get diff --git a/lxd/instance_instance_types.go b/lxd/instance_instance_types.go index 893ff256efa0..fcc02ce93a7e 100644 --- a/lxd/instance_instance_types.go +++ b/lxd/instance_instance_types.go @@ -11,13 +11,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) type instanceType struct { diff --git a/lxd/instance_logs.go b/lxd/instance_logs.go index 4725322acce1..d7e1a514b530 100644 --- a/lxd/instance_logs.go +++ b/lxd/instance_logs.go @@ -9,13 +9,13 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) var instanceLogCmd = APIEndpoint{ diff --git a/lxd/instance_metadata.go b/lxd/instance_metadata.go index d74aad4be2dc..cfc48e1b9e95 100644 --- a/lxd/instance_metadata.go +++ b/lxd/instance_metadata.go @@ -14,14 +14,14 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // swagger:operation GET /1.0/instances/{name}/metadata instances instance_metadata_get diff --git a/lxd/instance_patch.go b/lxd/instance_patch.go index adf4b17f1f95..66fc27fe055e 100644 --- a/lxd/instance_patch.go +++ b/lxd/instance_patch.go @@ -9,15 +9,15 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - projecthelpers "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + projecthelpers "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // swagger:operation PATCH /1.0/instances/{name} instances instance_patch diff --git a/lxd/instance_post.go b/lxd/instance_post.go index 238da16ef353..e3d843ee767c 100644 --- a/lxd/instance_post.go +++ b/lxd/instance_post.go @@ -11,19 +11,19 @@ import ( "github.com/pborman/uuid" "github.com/pkg/errors" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var internalClusterInstanceMovedCmd = APIEndpoint{ diff --git a/lxd/instance_put.go b/lxd/instance_put.go index e20c10586084..f38e39a44830 100644 --- a/lxd/instance_put.go +++ b/lxd/instance_put.go @@ -7,18 +7,18 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - projecthelpers "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + projecthelpers "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // swagger:operation PUT /1.0/instances/{name} instances instance_put diff --git a/lxd/instance_snapshot.go b/lxd/instance_snapshot.go index 240e160519b1..06275ebe817e 100644 --- a/lxd/instance_snapshot.go +++ b/lxd/instance_snapshot.go @@ -12,19 +12,19 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) // swagger:operation GET /1.0/instances/{name}/snapshots instances instance_snapshots_get diff --git a/lxd/instance_state.go b/lxd/instance_state.go index 8b062cfa903e..221120633198 100644 --- a/lxd/instance_state.go +++ b/lxd/instance_state.go @@ -8,12 +8,12 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // swagger:operation GET /1.0/instances/{name}/state instances instance_state_get diff --git a/lxd/instance_test.go b/lxd/instance_test.go index d5a4d3366ba8..a090b8ba6372 100644 --- a/lxd/instance_test.go +++ b/lxd/instance_test.go @@ -6,16 +6,16 @@ import ( "github.com/stretchr/testify/suite" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - instanceDrivers "github.com/lxc/lxd/lxd/instance/drivers" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/revert" - driver "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + instanceDrivers "github.com/canonical/lxd/lxd/instance/drivers" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/revert" + driver "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" ) type containerTestSuite struct { diff --git a/lxd/instances.go b/lxd/instances.go index bfeb6b9544ab..52561922e2e8 100644 --- a/lxd/instances.go +++ b/lxd/instances.go @@ -11,14 +11,14 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) var instancesCmd = APIEndpoint{ diff --git a/lxd/instances_get.go b/lxd/instances_get.go index 4aec93b93ade..5b3ea945c54a 100644 --- a/lxd/instances_get.go +++ b/lxd/instances_get.go @@ -12,18 +12,18 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/filter" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/filter" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // urlInstanceTypeDetect detects what sort of instance type filter is being requested. Either diff --git a/lxd/instances_post.go b/lxd/instances_post.go index 640840fa91ae..0c5c90607d81 100644 --- a/lxd/instances_post.go +++ b/lxd/instances_post.go @@ -16,22 +16,22 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" ) func createFromImage(d *Daemon, r *http.Request, projectName string, req *api.InstancesPost) response.Response { diff --git a/lxd/ip/addr.go b/lxd/ip/addr.go index 26ac6a61e72a..6ed4a3909e45 100644 --- a/lxd/ip/addr.go +++ b/lxd/ip/addr.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Addr represents arguments for address protocol manipulation diff --git a/lxd/ip/class.go b/lxd/ip/class.go index 35ef9e250ef5..319a6e8c55ea 100644 --- a/lxd/ip/class.go +++ b/lxd/ip/class.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Class represents qdisc class object diff --git a/lxd/ip/filter.go b/lxd/ip/filter.go index 0789f06a85ae..c71bf8ca7edd 100644 --- a/lxd/ip/filter.go +++ b/lxd/ip/filter.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Action represents an action in filter diff --git a/lxd/ip/link.go b/lxd/ip/link.go index b44c86c5eb22..165bd1068474 100644 --- a/lxd/ip/link.go +++ b/lxd/ip/link.go @@ -9,7 +9,7 @@ import ( "regexp" "strconv" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Link represents base arguments for link device diff --git a/lxd/ip/neigh.go b/lxd/ip/neigh.go index 2360e4841ef5..1098602898be 100644 --- a/lxd/ip/neigh.go +++ b/lxd/ip/neigh.go @@ -5,8 +5,8 @@ import ( "net" "strings" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // NeighbourIPState can be { PERMANENT | NOARP | REACHABLE | STALE | NONE | INCOMPLETE | DELAY | PROBE | FAILED }. diff --git a/lxd/ip/neigh_proxy.go b/lxd/ip/neigh_proxy.go index 24cf1dc506a5..4b8ecd4a22b8 100644 --- a/lxd/ip/neigh_proxy.go +++ b/lxd/ip/neigh_proxy.go @@ -4,8 +4,8 @@ import ( "net" "strings" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" ) // NeighProxy represents arguments for neighbour proxy manipulation. diff --git a/lxd/ip/qdisc.go b/lxd/ip/qdisc.go index 773730f25ba7..53f8dae0240a 100644 --- a/lxd/ip/qdisc.go +++ b/lxd/ip/qdisc.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Qdisc represents 'queueing discipline' object diff --git a/lxd/ip/route.go b/lxd/ip/route.go index 087089aa301f..7a4dcec5f447 100644 --- a/lxd/ip/route.go +++ b/lxd/ip/route.go @@ -3,7 +3,7 @@ package ip import ( "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Route represents arguments for route manipulation diff --git a/lxd/ip/tuntap.go b/lxd/ip/tuntap.go index ad02cde007ce..ccfb41e95b0f 100644 --- a/lxd/ip/tuntap.go +++ b/lxd/ip/tuntap.go @@ -1,7 +1,7 @@ package ip import ( - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Tuntap represents arguments for tuntap manipulation diff --git a/lxd/lifecycle/certificate.go b/lxd/lifecycle/certificate.go index 28eaced35308..2d4e3b37b572 100644 --- a/lxd/lifecycle/certificate.go +++ b/lxd/lifecycle/certificate.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // CertificateAction represents a lifecycle event action for Certificates. diff --git a/lxd/lifecycle/cluster.go b/lxd/lifecycle/cluster.go index 28a6b250b314..981c5d433d8d 100644 --- a/lxd/lifecycle/cluster.go +++ b/lxd/lifecycle/cluster.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // ClusterAction represents a lifecycle event action for clusters. diff --git a/lxd/lifecycle/cluster_member.go b/lxd/lifecycle/cluster_member.go index 64febb5eb14f..1bbedfe653fe 100644 --- a/lxd/lifecycle/cluster_member.go +++ b/lxd/lifecycle/cluster_member.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // ClusterMemberAction represents a lifecycle event action for cluster members. diff --git a/lxd/lifecycle/config.go b/lxd/lifecycle/config.go index 82a025115ace..72fd639c5905 100644 --- a/lxd/lifecycle/config.go +++ b/lxd/lifecycle/config.go @@ -3,7 +3,7 @@ package lifecycle import ( "fmt" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // ConfigAction represents a lifecycle event action for the server configuration diff --git a/lxd/lifecycle/image.go b/lxd/lifecycle/image.go index 82cb7d87a207..d225560440ae 100644 --- a/lxd/lifecycle/image.go +++ b/lxd/lifecycle/image.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // ImageAction represents a lifecycle event action for images. diff --git a/lxd/lifecycle/image_alias.go b/lxd/lifecycle/image_alias.go index 576af5951ac9..992d866aa026 100644 --- a/lxd/lifecycle/image_alias.go +++ b/lxd/lifecycle/image_alias.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // ImageAliasAction represents a lifecycle event action for image aliases. diff --git a/lxd/lifecycle/instance.go b/lxd/lifecycle/instance.go index 2083e56f69d9..9e4fd80d9007 100644 --- a/lxd/lifecycle/instance.go +++ b/lxd/lifecycle/instance.go @@ -3,9 +3,9 @@ package lifecycle import ( "fmt" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) // Internal copy of the instance interface. diff --git a/lxd/lifecycle/instance_backup.go b/lxd/lifecycle/instance_backup.go index 2056d9ef4df4..50f4dd24f5dc 100644 --- a/lxd/lifecycle/instance_backup.go +++ b/lxd/lifecycle/instance_backup.go @@ -4,9 +4,9 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // InstanceBackupAction represents a lifecycle event action for instance backups. diff --git a/lxd/lifecycle/instance_log.go b/lxd/lifecycle/instance_log.go index 56e1f82709a0..214050b2117d 100644 --- a/lxd/lifecycle/instance_log.go +++ b/lxd/lifecycle/instance_log.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // InstanceLogAction represents a lifecycle event action for instance logs. diff --git a/lxd/lifecycle/instance_metadata.go b/lxd/lifecycle/instance_metadata.go index 5446c1d31507..3f068f8288e9 100644 --- a/lxd/lifecycle/instance_metadata.go +++ b/lxd/lifecycle/instance_metadata.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // InstanceMetadataAction represents a lifecycle event action for instance metadata. diff --git a/lxd/lifecycle/instance_metadata_template.go b/lxd/lifecycle/instance_metadata_template.go index 4732ed4d579a..b7bcda604c15 100644 --- a/lxd/lifecycle/instance_metadata_template.go +++ b/lxd/lifecycle/instance_metadata_template.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // InstanceMetadataTemplateAction represents a lifecycle event action for instance metadata templates. diff --git a/lxd/lifecycle/instance_snapshot.go b/lxd/lifecycle/instance_snapshot.go index 76b8841aa1b6..07db118a7351 100644 --- a/lxd/lifecycle/instance_snapshot.go +++ b/lxd/lifecycle/instance_snapshot.go @@ -4,9 +4,9 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // InstanceSnapshotAction represents a lifecycle event action for instance snapshots. diff --git a/lxd/lifecycle/network.go b/lxd/lifecycle/network.go index 10118a990542..3d9547f90a61 100644 --- a/lxd/lifecycle/network.go +++ b/lxd/lifecycle/network.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // Internal copy of the network interface. diff --git a/lxd/lifecycle/operation.go b/lxd/lifecycle/operation.go index a6ff2a636f9e..00bd45561996 100644 --- a/lxd/lifecycle/operation.go +++ b/lxd/lifecycle/operation.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Internal copy of the operation interface. diff --git a/lxd/lifecycle/profile.go b/lxd/lifecycle/profile.go index 9d51a4f14835..2f05e2425cac 100644 --- a/lxd/lifecycle/profile.go +++ b/lxd/lifecycle/profile.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // ProfileAction represents a lifecycle event action for profiles. diff --git a/lxd/lifecycle/project.go b/lxd/lifecycle/project.go index 062f457c6c92..d42ad7d4af4a 100644 --- a/lxd/lifecycle/project.go +++ b/lxd/lifecycle/project.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // ProjectAction represents a lifecycle event action for projects. diff --git a/lxd/lifecycle/storage_pool.go b/lxd/lifecycle/storage_pool.go index 6ad9a887b451..8d253112c3e5 100644 --- a/lxd/lifecycle/storage_pool.go +++ b/lxd/lifecycle/storage_pool.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // StoragePoolAction represents a lifecycle event action for storage pools. diff --git a/lxd/lifecycle/storage_volume.go b/lxd/lifecycle/storage_volume.go index dbd11dd65936..5cc856b746d4 100644 --- a/lxd/lifecycle/storage_volume.go +++ b/lxd/lifecycle/storage_volume.go @@ -4,9 +4,9 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // Internal copy of the volume interface. diff --git a/lxd/lifecycle/storage_volume_snapshot.go b/lxd/lifecycle/storage_volume_snapshot.go index e948a06d49f4..f906e0b02a8c 100644 --- a/lxd/lifecycle/storage_volume_snapshot.go +++ b/lxd/lifecycle/storage_volume_snapshot.go @@ -4,10 +4,10 @@ import ( "fmt" "net/url" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // StorageVolumeSnapshotAction represents a lifecycle event action for storage volume snapshots. diff --git a/lxd/logging.go b/lxd/logging.go index 517aa9f4d6d5..db0c1e76a7d1 100644 --- a/lxd/logging.go +++ b/lxd/logging.go @@ -9,15 +9,15 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // This task function expires logs when executed. It's started by the Daemon diff --git a/lxd/maas/controller.go b/lxd/maas/controller.go index 152c31f1b3bd..c35e9a79b124 100644 --- a/lxd/maas/controller.go +++ b/lxd/maas/controller.go @@ -7,7 +7,7 @@ import ( "github.com/juju/gomaasapi" - "github.com/lxc/lxd/lxd/project" + "github.com/canonical/lxd/lxd/project" ) // Instance is a MAAS specific instance interface. diff --git a/lxd/main.go b/lxd/main.go index b60cfd489760..040bce2ccb4e 100644 --- a/lxd/main.go +++ b/lxd/main.go @@ -8,14 +8,14 @@ import ( "github.com/canonical/go-dqlite" "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/events" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/events" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/version" ) // Initialize the random number generator diff --git a/lxd/main_activateifneeded.go b/lxd/main_activateifneeded.go index b935579f73b1..bfdbf608c280 100644 --- a/lxd/main_activateifneeded.go +++ b/lxd/main_activateifneeded.go @@ -8,14 +8,14 @@ import ( sqlite3 "github.com/mattn/go-sqlite3" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) func init() { diff --git a/lxd/main_callhook.go b/lxd/main_callhook.go index 865345863f88..e24f6c70deec 100644 --- a/lxd/main_callhook.go +++ b/lxd/main_callhook.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" + "github.com/canonical/lxd/client" ) type cmdCallhook struct { diff --git a/lxd/main_checkfeature.go b/lxd/main_checkfeature.go index 3cfcbbffb934..46e3d641b829 100644 --- a/lxd/main_checkfeature.go +++ b/lxd/main_checkfeature.go @@ -5,10 +5,10 @@ import ( "os" "runtime" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) /* diff --git a/lxd/main_cluster.go b/lxd/main_cluster.go index ad92016c2cc6..f79c3bae0e5c 100644 --- a/lxd/main_cluster.go +++ b/lxd/main_cluster.go @@ -13,15 +13,15 @@ import ( "github.com/canonical/go-dqlite/client" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxc/utils" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/termios" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxc/utils" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/termios" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/lxd/main_daemon.go b/lxd/main_daemon.go index e1012ce835dd..0128d0d75a1e 100644 --- a/lxd/main_daemon.go +++ b/lxd/main_daemon.go @@ -11,8 +11,8 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared/logger" ) type cmdDaemon struct { diff --git a/lxd/main_forkcoresched.go b/lxd/main_forkcoresched.go index 19323c7c1f7f..1d4b3cde3a17 100644 --- a/lxd/main_forkcoresched.go +++ b/lxd/main_forkcoresched.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forkdns.go b/lxd/main_forkdns.go index a3c68642f133..db452d53dff5 100644 --- a/lxd/main_forkdns.go +++ b/lxd/main_forkdns.go @@ -14,11 +14,11 @@ import ( "github.com/miekg/dns" "github.com/spf13/cobra" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/dnsutil" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/dnsutil" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) type cmdForkDNS struct { diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go index 2f31921068e0..392397539dab 100644 --- a/lxd/main_forkexec.go +++ b/lxd/main_forkexec.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forkmount.go b/lxd/main_forkmount.go index 04af40e4b3d7..c7defba26703 100644 --- a/lxd/main_forkmount.go +++ b/lxd/main_forkmount.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forknet.go b/lxd/main_forknet.go index 8d8cc168cc32..bdb19414a16a 100644 --- a/lxd/main_forknet.go +++ b/lxd/main_forknet.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/shared/netutils" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/shared/netutils" ) /* diff --git a/lxd/main_forkproxy.go b/lxd/main_forkproxy.go index 222d608e9868..21db4de2b34c 100644 --- a/lxd/main_forkproxy.go +++ b/lxd/main_forkproxy.go @@ -16,13 +16,13 @@ import ( "golang.org/x/sys/unix" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/netutils" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/netutils" ) /* diff --git a/lxd/main_forkproxy_test.go b/lxd/main_forkproxy_test.go index 623519f0f062..80c16ff7f2ce 100644 --- a/lxd/main_forkproxy_test.go +++ b/lxd/main_forkproxy_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/device" - deviceConfig "github.com/lxc/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device" + deviceConfig "github.com/canonical/lxd/lxd/device/config" ) func TestParseAddr(t *testing.T) { diff --git a/lxd/main_forkstart.go b/lxd/main_forkstart.go index 14db13c7b327..7c95d4c18230 100644 --- a/lxd/main_forkstart.go +++ b/lxd/main_forkstart.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/unix" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) type cmdForkstart struct { diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go index 9a43dd65969e..f7a0e1ca5038 100644 --- a/lxd/main_forksyscall.go +++ b/lxd/main_forksyscall.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forkusernsexec.go b/lxd/main_forkusernsexec.go index 1cd65af5c67f..41e5da6825dd 100644 --- a/lxd/main_forkusernsexec.go +++ b/lxd/main_forkusernsexec.go @@ -7,7 +7,7 @@ import ( "golang.org/x/sys/unix" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_forkzfs.go b/lxd/main_forkzfs.go index df021fc95cbe..f21742792ed2 100644 --- a/lxd/main_forkzfs.go +++ b/lxd/main_forkzfs.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) type cmdForkZFS struct { diff --git a/lxd/main_init.go b/lxd/main_init.go index bbe1996e26b8..9ecfe1b85e17 100644 --- a/lxd/main_init.go +++ b/lxd/main_init.go @@ -8,11 +8,11 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/version" ) type cmdInitData struct { diff --git a/lxd/main_init_auto.go b/lxd/main_init_auto.go index a8668100e960..a3e47d004e17 100644 --- a/lxd/main_init_auto.go +++ b/lxd/main_init_auto.go @@ -6,11 +6,11 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) func (c *cmdInit) RunAuto(cmd *cobra.Command, args []string, d lxd.InstanceServer, server *api.Server) (*cmdInitData, error) { diff --git a/lxd/main_init_dump.go b/lxd/main_init_dump.go index 8e180b4f154f..b1f408970d7e 100644 --- a/lxd/main_init_dump.go +++ b/lxd/main_init_dump.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" yaml "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" ) func (c *cmdInit) RunDump(d lxd.InstanceServer) error { diff --git a/lxd/main_init_interactive.go b/lxd/main_init_interactive.go index 3c09af0cb40f..ce12dd02a1d3 100644 --- a/lxd/main_init_interactive.go +++ b/lxd/main_init_interactive.go @@ -15,17 +15,17 @@ import ( "golang.org/x/sys/unix" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) func (c *cmdInit) RunInteractive(cmd *cobra.Command, args []string, d lxd.InstanceServer, server *api.Server) (*cmdInitData, error) { diff --git a/lxd/main_init_preseed.go b/lxd/main_init_preseed.go index c6b534949488..c33514ff102a 100644 --- a/lxd/main_init_preseed.go +++ b/lxd/main_init_preseed.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/client" + "github.com/canonical/lxd/client" ) func (c *cmdInit) RunPreseed(cmd *cobra.Command, args []string, d lxd.InstanceServer) (*cmdInitData, error) { diff --git a/lxd/main_manpage.go b/lxd/main_manpage.go index 05e785f18d60..8d6342ebd516 100644 --- a/lxd/main_manpage.go +++ b/lxd/main_manpage.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/cobra/doc" - cli "github.com/lxc/lxd/shared/cmd" + cli "github.com/canonical/lxd/shared/cmd" ) type cmdManpage struct { diff --git a/lxd/main_migratedumpsuccess.go b/lxd/main_migratedumpsuccess.go index 1bbd00a42ae4..1d8f27a6c957 100644 --- a/lxd/main_migratedumpsuccess.go +++ b/lxd/main_migratedumpsuccess.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" ) type cmdMigratedumpsuccess struct { diff --git a/lxd/main_netcat.go b/lxd/main_netcat.go index b1dbf5faf332..0cc60c1336a4 100644 --- a/lxd/main_netcat.go +++ b/lxd/main_netcat.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/eagain" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/eagain" ) type cmdNetcat struct { diff --git a/lxd/main_nsexec.go b/lxd/main_nsexec.go index f11c0d4cb95b..73b2cd6e3a03 100644 --- a/lxd/main_nsexec.go +++ b/lxd/main_nsexec.go @@ -20,7 +20,7 @@ package main import ( // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/main_recover.go b/lxd/main_recover.go index a7fffd86a5e5..bb1c9a55d263 100644 --- a/lxd/main_recover.go +++ b/lxd/main_recover.go @@ -7,10 +7,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/api" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/api" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/validate" ) type cmdRecover struct { diff --git a/lxd/main_shutdown.go b/lxd/main_shutdown.go index e3d51b497206..68179751b975 100644 --- a/lxd/main_shutdown.go +++ b/lxd/main_shutdown.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" + "github.com/canonical/lxd/client" ) type cmdShutdown struct { diff --git a/lxd/main_sql.go b/lxd/main_sql.go index a6ee638a5a62..bd9add7fb0d7 100644 --- a/lxd/main_sql.go +++ b/lxd/main_sql.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared" ) type cmdSql struct { diff --git a/lxd/main_test.go b/lxd/main_test.go index e3701f46ca2d..3004a737f135 100644 --- a/lxd/main_test.go +++ b/lxd/main_test.go @@ -6,14 +6,14 @@ import ( "io/ioutil" "os" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/sys" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" ) func mockStartDaemon() (*Daemon, error) { diff --git a/lxd/main_version.go b/lxd/main_version.go index 9396b336e948..c54a995eeb16 100644 --- a/lxd/main_version.go +++ b/lxd/main_version.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/version" + cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/version" ) type cmdVersion struct { diff --git a/lxd/main_waitready.go b/lxd/main_waitready.go index da9caca5d649..30fd24f5250b 100644 --- a/lxd/main_waitready.go +++ b/lxd/main_waitready.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/shared/logger" ) type cmdWaitready struct { diff --git a/lxd/migrate.go b/lxd/migrate.go index f939b2d2565e..184d0f0a8721 100644 --- a/lxd/migrate.go +++ b/lxd/migrate.go @@ -1,6 +1,6 @@ // Package migration provides the primitives for migration in LXD. // -// See https://github.com/lxc/lxd/blob/master/specs/migration.md for a complete +// See https://github.com/canonical/lxd/blob/master/specs/migration.md for a complete // description. package main @@ -19,14 +19,14 @@ import ( "google.golang.org/protobuf/proto" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) type migrationFields struct { diff --git a/lxd/migrate_instance.go b/lxd/migrate_instance.go index 39cb362ddbeb..82b605f863f2 100644 --- a/lxd/migrate_instance.go +++ b/lxd/migrate_instance.go @@ -17,21 +17,21 @@ import ( "google.golang.org/protobuf/proto" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) func newMigrationSource(inst instance.Instance, stateful bool, instanceOnly bool) (*migrationSourceWs, error) { diff --git a/lxd/migrate_storage_volumes.go b/lxd/migrate_storage_volumes.go index b94db6e8b99d..e0c011a686af 100644 --- a/lxd/migrate_storage_volumes.go +++ b/lxd/migrate_storage_volumes.go @@ -7,15 +7,15 @@ import ( "github.com/gorilla/websocket" "google.golang.org/protobuf/proto" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) func newStorageMigrationSource(volumeOnly bool) (*migrationSourceWs, error) { diff --git a/lxd/migration/migration_volumes.go b/lxd/migration/migration_volumes.go index e6b71f5df962..098d963e1628 100644 --- a/lxd/migration/migration_volumes.go +++ b/lxd/migration/migration_volumes.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // Type represents the migration transport type. It indicates the method by which the migration can diff --git a/lxd/migration/wsproto.go b/lxd/migration/wsproto.go index bbc6a7010164..c4e9f2adbaaa 100644 --- a/lxd/migration/wsproto.go +++ b/lxd/migration/wsproto.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/websocket" "google.golang.org/protobuf/proto" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // ProtoRecv gets a protobuf message from a websocket diff --git a/lxd/network/driver_bridge.go b/lxd/network/driver_bridge.go index 6ccbfed79e95..01f4d6140267 100644 --- a/lxd/network/driver_bridge.go +++ b/lxd/network/driver_bridge.go @@ -18,27 +18,27 @@ import ( "github.com/mdlayher/netx/eui64" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/apparmor" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/daemon" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/dnsmasq" - "github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc" - firewallDrivers "github.com/lxc/lxd/lxd/firewall/drivers" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network/openvswitch" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/subprocess" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/apparmor" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/daemon" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/dnsmasq" + "github.com/canonical/lxd/lxd/dnsmasq/dhcpalloc" + firewallDrivers "github.com/canonical/lxd/lxd/firewall/drivers" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network/openvswitch" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/subprocess" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) // ForkdnsServersListPath defines the path that contains the forkdns server candidate file. diff --git a/lxd/network/driver_common.go b/lxd/network/driver_common.go index 6a36f276a6e7..154576094613 100644 --- a/lxd/network/driver_common.go +++ b/lxd/network/driver_common.go @@ -8,18 +8,18 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/validate" ) // Info represents information about a network driver. diff --git a/lxd/network/network_interface.go b/lxd/network/network_interface.go index 01acd3687200..c583a440126d 100644 --- a/lxd/network/network_interface.go +++ b/lxd/network/network_interface.go @@ -3,12 +3,12 @@ package network import ( "net" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // Type represents a LXD network driver type. diff --git a/lxd/network/network_load.go b/lxd/network/network_load.go index 208fcc98758d..96204a20ae0b 100644 --- a/lxd/network/network_load.go +++ b/lxd/network/network_load.go @@ -1,7 +1,7 @@ package network import ( - "github.com/lxc/lxd/lxd/state" + "github.com/canonical/lxd/lxd/state" ) var drivers = map[string]func() Network{ diff --git a/lxd/network/network_utils.go b/lxd/network/network_utils.go index 6ba522d79c0c..80504c747461 100644 --- a/lxd/network/network_utils.go +++ b/lxd/network/network_utils.go @@ -15,21 +15,21 @@ import ( "sync" "time" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/device/nictype" - "github.com/lxc/lxd/lxd/dnsmasq" - "github.com/lxc/lxd/lxd/dnsmasq/dhcpalloc" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/device/nictype" + "github.com/canonical/lxd/lxd/dnsmasq" + "github.com/canonical/lxd/lxd/dnsmasq/dhcpalloc" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) func networkValidPort(value string) error { diff --git a/lxd/network/network_utils_bridge.go b/lxd/network/network_utils_bridge.go index aaebbe1c25ff..79ccf353084e 100644 --- a/lxd/network/network_utils_bridge.go +++ b/lxd/network/network_utils_bridge.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "strings" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/network/openvswitch" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/network/openvswitch" + "github.com/canonical/lxd/shared" ) // BridgeVLANFilteringStatus returns whether VLAN filtering is enabled on a bridge interface. diff --git a/lxd/network/network_utils_sriov.go b/lxd/network/network_utils_sriov.go index 53fd470f21bc..df462c349aeb 100644 --- a/lxd/network/network_utils_sriov.go +++ b/lxd/network/network_utils_sriov.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/device/pci" - "github.com/lxc/lxd/lxd/ip" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/device/pci" + "github.com/canonical/lxd/lxd/ip" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // sriovReservedDevicesMutex used to coordinate access for checking reserved devices. diff --git a/lxd/network/openvswitch/ovs.go b/lxd/network/openvswitch/ovs.go index c94b9b770a95..476aeeeaf546 100644 --- a/lxd/network/openvswitch/ovs.go +++ b/lxd/network/openvswitch/ovs.go @@ -3,7 +3,7 @@ package openvswitch import ( "os/exec" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // NewOVS initialises new OVS wrapper. diff --git a/lxd/networks.go b/lxd/networks.go index eedbbb73d569..8dbfed37b40b 100644 --- a/lxd/networks.go +++ b/lxd/networks.go @@ -13,24 +13,24 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/network/openvswitch" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/network/openvswitch" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // Lock to prevent concurent networks creation diff --git a/lxd/networks_utils.go b/lxd/networks_utils.go index 7b2a49dbfefe..b3d1e73691e6 100644 --- a/lxd/networks_utils.go +++ b/lxd/networks_utils.go @@ -1,11 +1,11 @@ package main import ( - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" ) func networkAutoAttach(cluster *db.Cluster, devName string) error { diff --git a/lxd/node/config.go b/lxd/node/config.go index 276d55763d99..ec12a8bbe5a9 100644 --- a/lxd/node/config.go +++ b/lxd/node/config.go @@ -3,11 +3,11 @@ package node import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/config" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/config" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/validate" ) // Config holds node-local configuration values for a certain LXD instance. diff --git a/lxd/node/config_test.go b/lxd/node/config_test.go index fb20433f97b8..446467d7ef2c 100644 --- a/lxd/node/config_test.go +++ b/lxd/node/config_test.go @@ -3,8 +3,8 @@ package node_test import ( "testing" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/node/raft.go b/lxd/node/raft.go index 77cf61082bbe..37c4416d6f0a 100644 --- a/lxd/node/raft.go +++ b/lxd/node/raft.go @@ -3,7 +3,7 @@ package node import ( "github.com/canonical/go-dqlite/client" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) // DetermineRaftNode figures out what raft node ID and address we have, if any. diff --git a/lxd/node/raft_test.go b/lxd/node/raft_test.go index de87befd7159..36579c9a8a25 100644 --- a/lxd/node/raft_test.go +++ b/lxd/node/raft_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/node" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/node" ) // The raft identity (ID and address) of a node depends on the value of diff --git a/lxd/operations.go b/lxd/operations.go index 4d5822aa8aac..ee3540d0ffa6 100644 --- a/lxd/operations.go +++ b/lxd/operations.go @@ -11,19 +11,19 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var operationCmd = APIEndpoint{ diff --git a/lxd/operations/linux.go b/lxd/operations/linux.go index 8c8deaaaa45f..2164cf82e9f7 100644 --- a/lxd/operations/linux.go +++ b/lxd/operations/linux.go @@ -6,7 +6,7 @@ package operations import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) func registerDBOperation(op *Operation, opType db.OperationType) error { diff --git a/lxd/operations/notlinux.go b/lxd/operations/notlinux.go index a3409178825e..8b357d44a752 100644 --- a/lxd/operations/notlinux.go +++ b/lxd/operations/notlinux.go @@ -6,7 +6,7 @@ package operations import ( "fmt" - "github.com/lxc/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db" ) func registerDBOperation(op *Operation, opType db.OperationType) error { diff --git a/lxd/operations/operations.go b/lxd/operations/operations.go index 3ea7d30c0136..93f611073fe9 100644 --- a/lxd/operations/operations.go +++ b/lxd/operations/operations.go @@ -10,16 +10,16 @@ import ( "github.com/pborman/uuid" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/events" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/events" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) var debug bool diff --git a/lxd/operations/response.go b/lxd/operations/response.go index e3a9f50d2f12..09ecb2b2e91d 100644 --- a/lxd/operations/response.go +++ b/lxd/operations/response.go @@ -6,12 +6,12 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/version" ) // Operation response diff --git a/lxd/operations/websocket.go b/lxd/operations/websocket.go index 46c83473cd64..15427ed0d72a 100644 --- a/lxd/operations/websocket.go +++ b/lxd/operations/websocket.go @@ -6,8 +6,8 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/shared" ) type operationWebSocket struct { diff --git a/lxd/patches.go b/lxd/patches.go index d801741cdb43..9b90492aa14c 100644 --- a/lxd/patches.go +++ b/lxd/patches.go @@ -16,24 +16,24 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/db/query" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/network" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - driver "github.com/lxc/lxd/lxd/storage" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/db/query" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/network" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + driver "github.com/canonical/lxd/lxd/storage" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) type patchStage int diff --git a/lxd/patches_utils.go b/lxd/patches_utils.go index cb4c8a523751..4d673b17207f 100644 --- a/lxd/patches_utils.go +++ b/lxd/patches_utils.go @@ -10,12 +10,12 @@ import ( "strconv" "strings" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" ) // For 'btrfs' storage backend. diff --git a/lxd/profiles.go b/lxd/profiles.go index 71d45c097d27..9df97cf5227e 100644 --- a/lxd/profiles.go +++ b/lxd/profiles.go @@ -12,20 +12,20 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var profilesCmd = APIEndpoint{ diff --git a/lxd/profiles_utils.go b/lxd/profiles_utils.go index 177563bf803f..13a5c096ac79 100644 --- a/lxd/profiles_utils.go +++ b/lxd/profiles_utils.go @@ -5,13 +5,13 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) func doProfileUpdate(d *Daemon, projectName string, name string, id int64, profile *api.Profile, req api.ProfilePut) error { diff --git a/lxd/project/permissions.go b/lxd/project/permissions.go index 56360db1c250..d03e8c0d22e0 100644 --- a/lxd/project/permissions.go +++ b/lxd/project/permissions.go @@ -9,13 +9,13 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db" - deviceconfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/rbac" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/db" + deviceconfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/rbac" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" ) // AllowInstanceCreation returns an error if any project-specific limit or diff --git a/lxd/project/permissions_test.go b/lxd/project/permissions_test.go index 3327fcada096..06a3911e7f50 100644 --- a/lxd/project/permissions_test.go +++ b/lxd/project/permissions_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared/api" ) // If there's no limit configured on the project, the check passes. diff --git a/lxd/project/project.go b/lxd/project/project.go index ee5ed92e0943..b605266a46e8 100644 --- a/lxd/project/project.go +++ b/lxd/project/project.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared" ) // Default is the string used for a default project. diff --git a/lxd/project/project_test.go b/lxd/project/project_test.go index 43532a9f3bd3..8737dd2f875f 100644 --- a/lxd/project/project_test.go +++ b/lxd/project/project_test.go @@ -3,7 +3,7 @@ package project_test import ( "fmt" - "github.com/lxc/lxd/lxd/project" + "github.com/canonical/lxd/lxd/project" ) func ExampleInstance() { diff --git a/lxd/rbac/requests.go b/lxd/rbac/requests.go index aeea2acc1725..feb71a6ca97f 100644 --- a/lxd/rbac/requests.go +++ b/lxd/rbac/requests.go @@ -3,8 +3,8 @@ package rbac import ( "net/http" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/shared" ) // UserIsAdmin checks whether the requestor is a global admin. diff --git a/lxd/rbac/server.go b/lxd/rbac/server.go index d8e1054acb67..bf6a0721985e 100644 --- a/lxd/rbac/server.go +++ b/lxd/rbac/server.go @@ -19,8 +19,8 @@ import ( "gopkg.in/macaroon-bakery.v2/httpbakery" "gopkg.in/macaroon-bakery.v2/httpbakery/agent" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) type rbacResource struct { diff --git a/lxd/request/request.go b/lxd/request/request.go index ec680b775345..c9a40ae85d3a 100644 --- a/lxd/request/request.go +++ b/lxd/request/request.go @@ -5,7 +5,7 @@ import ( "net" "net/http" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // CreateRequestor extracts the lifecycle event requestor data from an http.Request context diff --git a/lxd/resources.go b/lxd/resources.go index 37b1095e244b..571b56ca3362 100644 --- a/lxd/resources.go +++ b/lxd/resources.go @@ -5,10 +5,10 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/lxd/lxd/resources" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/resources" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared/api" ) var api10ResourcesCmd = APIEndpoint{ diff --git a/lxd/resources/cpu.go b/lxd/resources/cpu.go index 423eb2c36bf7..007e63fa46e5 100644 --- a/lxd/resources/cpu.go +++ b/lxd/resources/cpu.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var sysDevicesCPU = "/sys/devices/system/cpu" diff --git a/lxd/resources/gpu.go b/lxd/resources/gpu.go index 78a770e859c5..03093fc9f682 100644 --- a/lxd/resources/gpu.go +++ b/lxd/resources/gpu.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var sysClassDrm = "/sys/class/drm" diff --git a/lxd/resources/memory.go b/lxd/resources/memory.go index 49a33f29fed2..675fecf6e17d 100644 --- a/lxd/resources/memory.go +++ b/lxd/resources/memory.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" ) var sysDevicesNode = "/sys/devices/system/node" diff --git a/lxd/resources/network.go b/lxd/resources/network.go index d8eed15dbfe0..cc2be1a8b44d 100644 --- a/lxd/resources/network.go +++ b/lxd/resources/network.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var sysClassNet = "/sys/class/net" diff --git a/lxd/resources/network_ethtool.go b/lxd/resources/network_ethtool.go index 1938cc8afe19..47633a3a61ff 100644 --- a/lxd/resources/network_ethtool.go +++ b/lxd/resources/network_ethtool.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) type ethtoolReq struct { diff --git a/lxd/resources/pci.go b/lxd/resources/pci.go index 3af3ec30238f..c34aaf8e637e 100644 --- a/lxd/resources/pci.go +++ b/lxd/resources/pci.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetPCI returns a filled api.ResourcesPCI struct ready for use by LXD diff --git a/lxd/resources/resources.go b/lxd/resources/resources.go index c35f8876eb41..e428686a3b07 100644 --- a/lxd/resources/resources.go +++ b/lxd/resources/resources.go @@ -3,7 +3,7 @@ package resources import ( "github.com/pkg/errors" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // GetResources returns a filled api.Resources struct ready for use by LXD diff --git a/lxd/resources/storage.go b/lxd/resources/storage.go index eb08f83b297f..1c7656a719b9 100644 --- a/lxd/resources/storage.go +++ b/lxd/resources/storage.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var devDiskByPath = "/dev/disk/by-path" diff --git a/lxd/resources/system.go b/lxd/resources/system.go index a074b548889f..1c4256a9f669 100644 --- a/lxd/resources/system.go +++ b/lxd/resources/system.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) var sysClassDMIID = "/sys/class/dmi/id" diff --git a/lxd/resources/usb.go b/lxd/resources/usb.go index 70ef3939e4f6..80baeb42329b 100644 --- a/lxd/resources/usb.go +++ b/lxd/resources/usb.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/usbid" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/usbid" ) var sysBusUSB = "/sys/bus/usb/devices" diff --git a/lxd/response.go b/lxd/response.go index 5869114fe36a..c31f3a7f9de9 100644 --- a/lxd/response.go +++ b/lxd/response.go @@ -3,9 +3,9 @@ package main import ( "net/http" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/response" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/response" ) func forwardedResponseToNode(d *Daemon, r *http.Request, node string) response.Response { diff --git a/lxd/response/response.go b/lxd/response/response.go index fd9cee4a341f..4ae19caf46d2 100644 --- a/lxd/response/response.go +++ b/lxd/response/response.go @@ -12,11 +12,11 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) var debug bool diff --git a/lxd/response/smart.go b/lxd/response/smart.go index c97282353df6..b25f8ae8e4af 100644 --- a/lxd/response/smart.go +++ b/lxd/response/smart.go @@ -8,8 +8,8 @@ import ( pkgErrors "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/shared/api" ) var httpResponseErrors = map[int][]error{ diff --git a/lxd/revert/revert_test.go b/lxd/revert/revert_test.go index 20b0fefb7b01..8dcb07bc51b1 100644 --- a/lxd/revert/revert_test.go +++ b/lxd/revert/revert_test.go @@ -3,7 +3,7 @@ package revert_test import ( "fmt" - "github.com/lxc/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/revert" ) func ExampleReverter_fail() { diff --git a/lxd/rsync/rsync.go b/lxd/rsync/rsync.go index ac1c53dad15e..409f84b7a8d9 100644 --- a/lxd/rsync/rsync.go +++ b/lxd/rsync/rsync.go @@ -12,10 +12,10 @@ import ( "github.com/pborman/uuid" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // Debug controls additional debugging in rsync output. diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go index 9dc09f314dbb..d2d667d058d4 100644 --- a/lxd/seccomp/seccomp.go +++ b/lxd/seccomp/seccomp.go @@ -21,18 +21,18 @@ import ( liblxc "gopkg.in/lxc/go-lxc.v2" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" - - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/ucred" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/netutils" - "github.com/lxc/lxd/shared/osarch" + _ "github.com/canonical/lxd/lxd/include" + + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/ucred" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/netutils" + "github.com/canonical/lxd/shared/osarch" ) /* diff --git a/lxd/snapshot_common.go b/lxd/snapshot_common.go index a33542f1ed35..f2e6417e6a4b 100644 --- a/lxd/snapshot_common.go +++ b/lxd/snapshot_common.go @@ -8,7 +8,7 @@ import ( "github.com/robfig/cron/v3" - "github.com/lxc/lxd/lxd/util" + "github.com/canonical/lxd/lxd/util" ) // SnapshotScheduleAliases contains the mapping of scheduling aliases to cron syntax diff --git a/lxd/snapshot_common_test.go b/lxd/snapshot_common_test.go index 2a08eaf2bf35..3e657e975bf6 100644 --- a/lxd/snapshot_common_test.go +++ b/lxd/snapshot_common_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/suite" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/revert" ) func (suite *containerTestSuite) TestSnapshotScheduling() { diff --git a/lxd/state/notlinux.go b/lxd/state/notlinux.go index 6a1a11a143d2..af714abf4af4 100644 --- a/lxd/state/notlinux.go +++ b/lxd/state/notlinux.go @@ -6,7 +6,7 @@ package state import ( "context" - "github.com/lxc/lxd/lxd/events" + "github.com/canonical/lxd/lxd/events" ) // State here is just an empty shim to statisfy dependencies. diff --git a/lxd/state/state.go b/lxd/state/state.go index 5d6d8f978f22..23b22116568e 100644 --- a/lxd/state/state.go +++ b/lxd/state/state.go @@ -8,15 +8,15 @@ import ( "net/http" "net/url" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/endpoints" - "github.com/lxc/lxd/lxd/events" - "github.com/lxc/lxd/lxd/firewall" - "github.com/lxc/lxd/lxd/fsmonitor" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/maas" - "github.com/lxc/lxd/lxd/sys" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/endpoints" + "github.com/canonical/lxd/lxd/events" + "github.com/canonical/lxd/lxd/firewall" + "github.com/canonical/lxd/lxd/fsmonitor" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/maas" + "github.com/canonical/lxd/lxd/sys" + "github.com/canonical/lxd/shared" ) // State is a gateway to the two main stateful components of LXD, the database diff --git a/lxd/state/testing.go b/lxd/state/testing.go index f750884ecd8d..6242363ae5d2 100644 --- a/lxd/state/testing.go +++ b/lxd/state/testing.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/firewall" - "github.com/lxc/lxd/lxd/sys" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/firewall" + "github.com/canonical/lxd/lxd/sys" ) // NewTestState returns a State object initialized with testable instances of diff --git a/lxd/storage.go b/lxd/storage.go index 7bbfe0cbe4c6..5d1bf69f304e 100644 --- a/lxd/storage.go +++ b/lxd/storage.go @@ -9,16 +9,16 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // Simply cache used to storage the activated drivers on this LXD instance. This diff --git a/lxd/storage/backend_lxd.go b/lxd/storage/backend_lxd.go index c7e12156a211..3ca73603c85f 100644 --- a/lxd/storage/backend_lxd.go +++ b/lxd/storage/backend_lxd.go @@ -13,28 +13,28 @@ import ( log "gopkg.in/inconshreveable/log15.v2" yaml "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/locking" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/storage/memorypipe" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/locking" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/storage/memorypipe" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) type lxdBackend struct { diff --git a/lxd/storage/backend_lxd_patches.go b/lxd/storage/backend_lxd_patches.go index 2f05ded5a9b8..ef09d0fce950 100644 --- a/lxd/storage/backend_lxd_patches.go +++ b/lxd/storage/backend_lxd_patches.go @@ -6,14 +6,14 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) var lxdEarlyPatches = map[string]func(b *lxdBackend) error{} diff --git a/lxd/storage/backend_mock.go b/lxd/storage/backend_mock.go index 818ba0295edc..4701d7e06e94 100644 --- a/lxd/storage/backend_mock.go +++ b/lxd/storage/backend_mock.go @@ -4,17 +4,17 @@ import ( "io" "time" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/logger" ) type mockBackend struct { diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go index 8ce8b550547c..987e70e38cb8 100644 --- a/lxd/storage/drivers/driver_btrfs.go +++ b/lxd/storage/drivers/driver_btrfs.go @@ -10,14 +10,14 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) var btrfsVersion string diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go index bab3ffd8bc7d..2f4202a4bb7d 100644 --- a/lxd/storage/drivers/driver_btrfs_utils.go +++ b/lxd/storage/drivers/driver_btrfs_utils.go @@ -15,10 +15,10 @@ import ( "golang.org/x/sys/unix" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" ) // Errors diff --git a/lxd/storage/drivers/driver_btrfs_volumes.go b/lxd/storage/drivers/driver_btrfs_volumes.go index 53e2baa12ea1..2eb8c75a43fc 100644 --- a/lxd/storage/drivers/driver_btrfs_volumes.go +++ b/lxd/storage/drivers/driver_btrfs_volumes.go @@ -16,14 +16,14 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied filler function. diff --git a/lxd/storage/drivers/driver_ceph.go b/lxd/storage/drivers/driver_ceph.go index 2906d6409b75..801515354fd2 100644 --- a/lxd/storage/drivers/driver_ceph.go +++ b/lxd/storage/drivers/driver_ceph.go @@ -9,13 +9,13 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) var cephAllowedFilesystems = []string{"btrfs", "ext4", "xfs"} diff --git a/lxd/storage/drivers/driver_ceph_utils.go b/lxd/storage/drivers/driver_ceph_utils.go index 0eaa330cb11b..4b7f70c32deb 100644 --- a/lxd/storage/drivers/driver_ceph_utils.go +++ b/lxd/storage/drivers/driver_ceph_utils.go @@ -15,11 +15,11 @@ import ( "github.com/pborman/uuid" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // cephBlockVolSuffix suffix used for block content type volumes. diff --git a/lxd/storage/drivers/driver_ceph_volumes.go b/lxd/storage/drivers/driver_ceph_volumes.go index f2cb2797d624..e7cc1858bc41 100644 --- a/lxd/storage/drivers/driver_ceph_volumes.go +++ b/lxd/storage/drivers/driver_ceph_volumes.go @@ -15,17 +15,17 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied diff --git a/lxd/storage/drivers/driver_cephfs.go b/lxd/storage/drivers/driver_cephfs.go index 98519947cc54..cef877c89f6b 100644 --- a/lxd/storage/drivers/driver_cephfs.go +++ b/lxd/storage/drivers/driver_cephfs.go @@ -10,12 +10,12 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/validate" ) var cephfsVersion string diff --git a/lxd/storage/drivers/driver_cephfs_utils.go b/lxd/storage/drivers/driver_cephfs_utils.go index f46d9424691f..594a45b567c9 100644 --- a/lxd/storage/drivers/driver_cephfs_utils.go +++ b/lxd/storage/drivers/driver_cephfs_utils.go @@ -3,7 +3,7 @@ package drivers import ( "fmt" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // fsExists checks that the Ceph FS instance indeed exists. diff --git a/lxd/storage/drivers/driver_cephfs_volumes.go b/lxd/storage/drivers/driver_cephfs_volumes.go index 81ff84064782..b4c0e3aa53ca 100644 --- a/lxd/storage/drivers/driver_cephfs_volumes.go +++ b/lxd/storage/drivers/driver_cephfs_volumes.go @@ -10,15 +10,15 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) // CreateVolume creates a new storage volume on disk. diff --git a/lxd/storage/drivers/driver_common.go b/lxd/storage/drivers/driver_common.go index 95b080af3c6a..f4edc8ec05c0 100644 --- a/lxd/storage/drivers/driver_common.go +++ b/lxd/storage/drivers/driver_common.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) type common struct { diff --git a/lxd/storage/drivers/driver_dir.go b/lxd/storage/drivers/driver_dir.go index 2f94eb57f818..01ce28a57b1b 100644 --- a/lxd/storage/drivers/driver_dir.go +++ b/lxd/storage/drivers/driver_dir.go @@ -7,9 +7,9 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) type dir struct { diff --git a/lxd/storage/drivers/driver_dir_utils.go b/lxd/storage/drivers/driver_dir_utils.go index 9d2ef1fcf61e..b8f4fda8f2b2 100644 --- a/lxd/storage/drivers/driver_dir_utils.go +++ b/lxd/storage/drivers/driver_dir_utils.go @@ -5,9 +5,9 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/quota" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/quota" + "github.com/canonical/lxd/shared/units" ) // withoutGetVolID returns a copy of this struct but with a volIDFunc which will cause quotas to be skipped. diff --git a/lxd/storage/drivers/driver_dir_volumes.go b/lxd/storage/drivers/driver_dir_volumes.go index 003bd8d43f53..158b10490a18 100644 --- a/lxd/storage/drivers/driver_dir_volumes.go +++ b/lxd/storage/drivers/driver_dir_volumes.go @@ -9,15 +9,15 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/storage/quota" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/storage/quota" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/units" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied diff --git a/lxd/storage/drivers/driver_lvm.go b/lxd/storage/drivers/driver_lvm.go index 2c16ece57bad..de8a843a6840 100644 --- a/lxd/storage/drivers/driver_lvm.go +++ b/lxd/storage/drivers/driver_lvm.go @@ -12,12 +12,12 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) const lvmVgPoolMarker = "lxd_pool" // Indicator tag used to mark volume groups as in use by LXD. @@ -551,7 +551,7 @@ func (d *lvm) Mount() (bool, error) { } // Unmount unmounts the storage pool (this does nothing). -// LVM doesn't currently support unmounting, please see https://github.com/lxc/lxd/issues/9278 +// LVM doesn't currently support unmounting, please see https://github.com/canonical/lxd/issues/9278 func (d *lvm) Unmount() (bool, error) { return false, nil } diff --git a/lxd/storage/drivers/driver_lvm_patches.go b/lxd/storage/drivers/driver_lvm_patches.go index 082aedbafe53..3a12e320c935 100644 --- a/lxd/storage/drivers/driver_lvm_patches.go +++ b/lxd/storage/drivers/driver_lvm_patches.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // patchStorageSkipActivation set skipactivation=y on all LXD LVM logical volumes (excluding thin pool volumes). diff --git a/lxd/storage/drivers/driver_lvm_utils.go b/lxd/storage/drivers/driver_lvm_utils.go index 463e6055194c..fbb04fccfd67 100644 --- a/lxd/storage/drivers/driver_lvm_utils.go +++ b/lxd/storage/drivers/driver_lvm_utils.go @@ -11,12 +11,12 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/locking" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/locking" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/version" ) // lvmBlockVolSuffix suffix used for block content type volumes. diff --git a/lxd/storage/drivers/driver_lvm_volumes.go b/lxd/storage/drivers/driver_lvm_volumes.go index 53c13dd180a5..15318793a7cc 100644 --- a/lxd/storage/drivers/driver_lvm_volumes.go +++ b/lxd/storage/drivers/driver_lvm_volumes.go @@ -14,15 +14,15 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/validate" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied filler function. diff --git a/lxd/storage/drivers/driver_mock.go b/lxd/storage/drivers/driver_mock.go index 76ce6b126839..69f3746aa219 100644 --- a/lxd/storage/drivers/driver_mock.go +++ b/lxd/storage/drivers/driver_mock.go @@ -3,12 +3,12 @@ package drivers import ( "io" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" ) type mock struct { diff --git a/lxd/storage/drivers/driver_zfs.go b/lxd/storage/drivers/driver_zfs.go index 095740618199..3c92ad57581e 100644 --- a/lxd/storage/drivers/driver_zfs.go +++ b/lxd/storage/drivers/driver_zfs.go @@ -10,14 +10,14 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" + "github.com/canonical/lxd/shared/version" ) var zfsVersion string diff --git a/lxd/storage/drivers/driver_zfs_patches.go b/lxd/storage/drivers/driver_zfs_patches.go index dcc638f008aa..bf235f71fb4f 100644 --- a/lxd/storage/drivers/driver_zfs_patches.go +++ b/lxd/storage/drivers/driver_zfs_patches.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) func (d *zfs) patchStorageCreateVM() error { diff --git a/lxd/storage/drivers/driver_zfs_utils.go b/lxd/storage/drivers/driver_zfs_utils.go index 8e6134578509..eb425f87a7e7 100644 --- a/lxd/storage/drivers/driver_zfs_utils.go +++ b/lxd/storage/drivers/driver_zfs_utils.go @@ -10,10 +10,10 @@ import ( "github.com/pborman/uuid" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) const ( diff --git a/lxd/storage/drivers/driver_zfs_volumes.go b/lxd/storage/drivers/driver_zfs_volumes.go index 174ca1294eb1..28e1c071a7c5 100644 --- a/lxd/storage/drivers/driver_zfs_volumes.go +++ b/lxd/storage/drivers/driver_zfs_volumes.go @@ -18,17 +18,17 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/instance/operationlock" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/instance/operationlock" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // CreateVolume creates an empty volume and can optionally fill it by executing the supplied diff --git a/lxd/storage/drivers/generic_vfs.go b/lxd/storage/drivers/generic_vfs.go index 94388b98ebcd..f803c33eac4b 100644 --- a/lxd/storage/drivers/generic_vfs.go +++ b/lxd/storage/drivers/generic_vfs.go @@ -13,17 +13,17 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" ) // genericVolumeBlockExtension extension used for generic block volume disk files. diff --git a/lxd/storage/drivers/interface.go b/lxd/storage/drivers/interface.go index 60c0e83590df..064394f00613 100644 --- a/lxd/storage/drivers/interface.go +++ b/lxd/storage/drivers/interface.go @@ -3,14 +3,14 @@ package drivers import ( "io" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" + "github.com/canonical/lxd/shared/logger" ) // driver is the extended internal interface. diff --git a/lxd/storage/drivers/load.go b/lxd/storage/drivers/load.go index 38e41058f631..59118d306d53 100644 --- a/lxd/storage/drivers/load.go +++ b/lxd/storage/drivers/load.go @@ -1,8 +1,8 @@ package drivers import ( - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/shared/logger" ) var drivers = map[string]func() driver{ diff --git a/lxd/storage/drivers/utils.go b/lxd/storage/drivers/utils.go index be89fe790b19..319a5b1296d1 100644 --- a/lxd/storage/drivers/utils.go +++ b/lxd/storage/drivers/utils.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" ) // MinBlockBoundary minimum block boundary size to use. diff --git a/lxd/storage/drivers/utils_cgo.go b/lxd/storage/drivers/utils_cgo.go index 51c304a7d75c..6c970b704ed4 100644 --- a/lxd/storage/drivers/utils_cgo.go +++ b/lxd/storage/drivers/utils_cgo.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" ) /* diff --git a/lxd/storage/drivers/volume.go b/lxd/storage/drivers/volume.go index 170fd848520f..50cc11a8f78d 100644 --- a/lxd/storage/drivers/volume.go +++ b/lxd/storage/drivers/volume.go @@ -6,13 +6,13 @@ import ( "github.com/pkg/errors" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/locking" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/refcount" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/units" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/locking" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/refcount" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/units" ) // tmpVolSuffix Suffix to use for any temporary volumes created by LXD. diff --git a/lxd/storage/filesystem/fs.go b/lxd/storage/filesystem/fs.go index 79961bfd210f..80b8ac569f44 100644 --- a/lxd/storage/filesystem/fs.go +++ b/lxd/storage/filesystem/fs.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // Filesystem magic numbers. diff --git a/lxd/storage/load.go b/lxd/storage/load.go index 39c3b788d3ba..fb1a44971c96 100644 --- a/lxd/storage/load.go +++ b/lxd/storage/load.go @@ -5,15 +5,15 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" ) // PoolIDTemporary is used to indicate a temporary pool instance that is not in the database. diff --git a/lxd/storage/pool_interface.go b/lxd/storage/pool_interface.go index a1cfbe10a30e..add0944d449c 100644 --- a/lxd/storage/pool_interface.go +++ b/lxd/storage/pool_interface.go @@ -4,15 +4,15 @@ import ( "io" "time" - "github.com/lxc/lxd/lxd/backup" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/instancewriter" + "github.com/canonical/lxd/lxd/backup" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/instancewriter" ) // MountInfo represents info about the result of a mount operation. diff --git a/lxd/storage/quota/projectquota.go b/lxd/storage/quota/projectquota.go index 81828a2f8d47..28f607ec41b4 100644 --- a/lxd/storage/quota/projectquota.go +++ b/lxd/storage/quota/projectquota.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) /* diff --git a/lxd/storage/storage.go b/lxd/storage/storage.go index f8b5658b10a5..7d0f13279ee3 100644 --- a/lxd/storage/storage.go +++ b/lxd/storage/storage.go @@ -3,9 +3,9 @@ package storage import ( "os" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/shared" ) // InstancePath returns the directory of an instance or snapshot. diff --git a/lxd/storage/utils.go b/lxd/storage/utils.go index 78f0609ef7ce..4bfae530ab09 100644 --- a/lxd/storage/utils.go +++ b/lxd/storage/utils.go @@ -12,24 +12,24 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/lxd/node" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/rsync" - "github.com/lxc/lxd/lxd/state" - "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/logging" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/lxd/node" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/rsync" + "github.com/canonical/lxd/lxd/state" + "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/logging" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // ValidName validates the provided name, and returns an error if it's not a valid storage name. diff --git a/lxd/storage_migration.go b/lxd/storage_migration.go index aaa3a9eb4e5e..c7f1bd24fd8e 100644 --- a/lxd/storage_migration.go +++ b/lxd/storage_migration.go @@ -3,11 +3,11 @@ package main import ( "time" - "github.com/lxc/lxd/lxd/db" - deviceConfig "github.com/lxc/lxd/lxd/device/config" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/migration" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/db" + deviceConfig "github.com/canonical/lxd/lxd/device/config" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/migration" + "github.com/canonical/lxd/shared" ) func snapshotProtobufToInstanceArgs(inst instance.Instance, snap *migration.Snapshot) db.InstanceArgs { diff --git a/lxd/storage_pools.go b/lxd/storage_pools.go index 39278e6c14a4..b5d95704880e 100644 --- a/lxd/storage_pools.go +++ b/lxd/storage_pools.go @@ -11,20 +11,20 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/client" - "github.com/lxc/lxd/lxd/cluster" - clusterRequest "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/lifecycle" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/request" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/client" + "github.com/canonical/lxd/lxd/cluster" + clusterRequest "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/lifecycle" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/request" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) // Lock to prevent concurent storage pools creation diff --git a/lxd/storage_pools_config.go b/lxd/storage_pools_config.go index 68a0a4f19b69..17ec381f0702 100644 --- a/lxd/storage_pools_config.go +++ b/lxd/storage_pools_config.go @@ -7,10 +7,10 @@ import ( "golang.org/x/sys/unix" - storageDrivers "github.com/lxc/lxd/lxd/storage/drivers" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + storageDrivers "github.com/canonical/lxd/lxd/storage/drivers" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) var storagePoolConfigKeys = map[string]func(value string) error{ diff --git a/lxd/storage_pools_utils.go b/lxd/storage_pools_utils.go index 5c85e343af16..c9ba5bccf62d 100644 --- a/lxd/storage_pools_utils.go +++ b/lxd/storage_pools_utils.go @@ -6,14 +6,14 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster/request" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cluster/request" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" ) // storagePoolDBCreate creates a storage pool DB entry and returns the created Pool ID. diff --git a/lxd/storage_volumes.go b/lxd/storage_volumes.go index 5bd66552b534..e3cfa2cb0930 100644 --- a/lxd/storage_volumes.go +++ b/lxd/storage_volumes.go @@ -13,19 +13,19 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - "github.com/lxc/lxd/lxd/revert" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + "github.com/canonical/lxd/lxd/revert" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) var storagePoolVolumesCmd = APIEndpoint{ diff --git a/lxd/storage_volumes_snapshot.go b/lxd/storage_volumes_snapshot.go index 35b88ae69123..aa8b1741d083 100644 --- a/lxd/storage_volumes_snapshot.go +++ b/lxd/storage_volumes_snapshot.go @@ -14,19 +14,19 @@ import ( "github.com/pkg/errors" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cluster" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/operations" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/response" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/lxd/task" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/cluster" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/operations" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/response" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/lxd/task" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/version" ) var storagePoolVolumeSnapshotsTypeCmd = APIEndpoint{ diff --git a/lxd/storage_volumes_utils.go b/lxd/storage_volumes_utils.go index 807f11db1f8e..178be1c9ea4d 100644 --- a/lxd/storage_volumes_utils.go +++ b/lxd/storage_volumes_utils.go @@ -3,14 +3,14 @@ package main import ( "fmt" - "github.com/lxc/lxd/lxd/db" - "github.com/lxc/lxd/lxd/instance" - "github.com/lxc/lxd/lxd/project" - "github.com/lxc/lxd/lxd/state" - storagePools "github.com/lxc/lxd/lxd/storage" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/version" + "github.com/canonical/lxd/lxd/db" + "github.com/canonical/lxd/lxd/instance" + "github.com/canonical/lxd/lxd/project" + "github.com/canonical/lxd/lxd/state" + storagePools "github.com/canonical/lxd/lxd/storage" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/version" ) var supportedVolumeTypes = []int{db.StoragePoolVolumeTypeContainer, db.StoragePoolVolumeTypeVM, db.StoragePoolVolumeTypeCustom, db.StoragePoolVolumeTypeImage} diff --git a/lxd/swagger.go b/lxd/swagger.go index 31470c432140..1a6b42dba2a5 100644 --- a/lxd/swagger.go +++ b/lxd/swagger.go @@ -11,13 +11,13 @@ // // Version: 1.0 // License: Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0 -// Contact: LXD upstream https://github.com/lxc/lxd +// Contact: LXD upstream https://github.com/canonical/lxd // // swagger:meta package main import ( - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) // Common error definitions. diff --git a/lxd/sys/apparmor.go b/lxd/sys/apparmor.go index 3c65687719e5..501d4624de1b 100644 --- a/lxd/sys/apparmor.go +++ b/lxd/sys/apparmor.go @@ -12,9 +12,9 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" "github.com/syndtr/gocapability/capability" ) diff --git a/lxd/sys/os.go b/lxd/sys/os.go index a9c490cc1eb6..afa4657e85ff 100644 --- a/lxd/sys/os.go +++ b/lxd/sys/os.go @@ -11,12 +11,12 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/lxd/cgroup" - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/lxd/cgroup" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) // InotifyTargetInfo records the inotify information associated with a given diff --git a/lxd/task/group_test.go b/lxd/task/group_test.go index 26a089a484e2..0f08a5404475 100644 --- a/lxd/task/group_test.go +++ b/lxd/task/group_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/task" + "github.com/canonical/lxd/lxd/task" "github.com/stretchr/testify/assert" ) diff --git a/lxd/task/task_test.go b/lxd/task/task_test.go index 3ede9bc3a55a..873166164323 100644 --- a/lxd/task/task_test.go +++ b/lxd/task/task_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/lxc/lxd/lxd/task" + "github.com/canonical/lxd/lxd/task" "github.com/stretchr/testify/assert" ) diff --git a/lxd/ucred/ucred.go b/lxd/ucred/ucred.go index 48cc92a2114e..141071cf6cf1 100644 --- a/lxd/ucred/ucred.go +++ b/lxd/ucred/ucred.go @@ -7,8 +7,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/lxd/endpoints/listeners" - "github.com/lxc/lxd/lxd/request" + "github.com/canonical/lxd/lxd/endpoints/listeners" + "github.com/canonical/lxd/lxd/request" ) // ErrNotUnixSocket is returned when the underlying connection isn't a unix socket. diff --git a/lxd/util/config.go b/lxd/util/config.go index 334b51954618..255f15898fa1 100644 --- a/lxd/util/config.go +++ b/lxd/util/config.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // CompareConfigs compares two config maps and returns an error if they differ. diff --git a/lxd/util/config_test.go b/lxd/util/config_test.go index 4c6e25194423..f4800a225a79 100644 --- a/lxd/util/config_test.go +++ b/lxd/util/config_test.go @@ -3,7 +3,7 @@ package util_test import ( "testing" - "github.com/lxc/lxd/lxd/util" + "github.com/canonical/lxd/lxd/util" "github.com/stretchr/testify/assert" ) diff --git a/lxd/util/encryption.go b/lxd/util/encryption.go index 87b717e27445..2fd67dc8902f 100644 --- a/lxd/util/encryption.go +++ b/lxd/util/encryption.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" "github.com/pkg/errors" "golang.org/x/crypto/scrypt" diff --git a/lxd/util/http.go b/lxd/util/http.go index 1cc1ce137949..14a71f4f62b7 100644 --- a/lxd/util/http.go +++ b/lxd/util/http.go @@ -20,8 +20,8 @@ import ( "golang.org/x/sys/unix" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // DebugJSON helper to log JSON. diff --git a/lxd/util/kernel.go b/lxd/util/kernel.go index eb82d9c8d374..3a7e3287c0a9 100644 --- a/lxd/util/kernel.go +++ b/lxd/util/kernel.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // LoadModule loads the kernel module with the given name, by invoking diff --git a/lxd/util/net.go b/lxd/util/net.go index 9e01a6559452..73c54d7b7409 100644 --- a/lxd/util/net.go +++ b/lxd/util/net.go @@ -13,8 +13,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // InMemoryNetwork creates a fully in-memory listener and dial function. diff --git a/lxd/util/net_test.go b/lxd/util/net_test.go index 8ca003536176..eb684bbcbeb3 100644 --- a/lxd/util/net_test.go +++ b/lxd/util/net_test.go @@ -6,8 +6,8 @@ import ( "net" "testing" - "github.com/lxc/lxd/lxd/util" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/lxd/util" + "github.com/canonical/lxd/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/lxd/util/storage.go b/lxd/util/storage.go index ddb78825c9e0..7384c543b68c 100644 --- a/lxd/util/storage.go +++ b/lxd/util/storage.go @@ -1,9 +1,9 @@ package util import ( - "github.com/lxc/lxd/lxd/storage/filesystem" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/lxd/storage/filesystem" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" ) // PoolType represents a type of storage pool (local, remote or any). diff --git a/lxd/util/sys.go b/lxd/util/sys.go index 7e3160ed1378..25ad741b3f5f 100644 --- a/lxd/util/sys.go +++ b/lxd/util/sys.go @@ -13,9 +13,9 @@ import ( log "gopkg.in/inconshreveable/log15.v2" liblxc "gopkg.in/lxc/go-lxc.v2" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/osarch" ) // GetArchitectures returns the list of supported architectures. diff --git a/lxd/vsock/vsock.go b/lxd/vsock/vsock.go index eeea94f968c0..6bef62cd3ee8 100644 --- a/lxd/vsock/vsock.go +++ b/lxd/vsock/vsock.go @@ -9,7 +9,7 @@ import ( "github.com/mdlayher/vsock" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Dial connects to a remote vsock. diff --git a/shared/archive_linux.go b/shared/archive_linux.go index a9557c970ec9..dd706b3fa2f8 100644 --- a/shared/archive_linux.go +++ b/shared/archive_linux.go @@ -8,8 +8,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/logger" ) func Unpack(file string, path string, blockBackend bool, runningInUserns bool, tracker *ioprogress.ProgressTracker) error { diff --git a/shared/cert_test.go b/shared/cert_test.go index a1874ece75f9..3bc968b6706d 100644 --- a/shared/cert_test.go +++ b/shared/cert_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // A new key pair is generated if none exists and saved to the appropriate diff --git a/shared/cmd/ask.go b/shared/cmd/ask.go index cfc947d9c531..1c48463f7d1e 100644 --- a/shared/cmd/ask.go +++ b/shared/cmd/ask.go @@ -9,7 +9,7 @@ import ( "golang.org/x/crypto/ssh/terminal" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) var stdin = bufio.NewReader(os.Stdin) diff --git a/shared/eagain/file_unix.go b/shared/eagain/file_unix.go index d80d23f8ab6b..6724918d1eaf 100644 --- a/shared/eagain/file_unix.go +++ b/shared/eagain/file_unix.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Reader represents an io.Reader that handles EAGAIN diff --git a/shared/idmap/idmapset_linux.go b/shared/idmap/idmapset_linux.go index 7326a4907ad0..a14f8548cea4 100644 --- a/shared/idmap/idmapset_linux.go +++ b/shared/idmap/idmapset_linux.go @@ -17,8 +17,8 @@ import ( "strings" "sync/atomic" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" "github.com/pkg/errors" ) diff --git a/shared/idmap/shift_linux.go b/shared/idmap/shift_linux.go index daaf3727571f..ee67a4400d05 100644 --- a/shared/idmap/shift_linux.go +++ b/shared/idmap/shift_linux.go @@ -13,10 +13,10 @@ import ( "golang.org/x/sys/unix" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // #cgo LDFLAGS: -lacl diff --git a/shared/instance.go b/shared/instance.go index 9612f5cc3d21..6468bb272323 100644 --- a/shared/instance.go +++ b/shared/instance.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/lxc/lxd/lxd/instance/instancetype" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/lxd/instance/instancetype" + "github.com/canonical/lxd/shared/units" + "github.com/canonical/lxd/shared/validate" ) // InstanceAction indicates the type of action being performed. diff --git a/shared/instancewriter/instance_tar_writer.go b/shared/instancewriter/instance_tar_writer.go index 3d5ac875e695..c376b7525923 100644 --- a/shared/instancewriter/instance_tar_writer.go +++ b/shared/instancewriter/instance_tar_writer.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/idmap" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/idmap" + "github.com/canonical/lxd/shared/logger" ) // InstanceTarWriter provides a TarWriter implementation that handles ID shifting and hardlink tracking. diff --git a/shared/logging/log.go b/shared/logging/log.go index a074628113e0..2c41e22aa47f 100644 --- a/shared/logging/log.go +++ b/shared/logging/log.go @@ -9,7 +9,7 @@ import ( log "gopkg.in/inconshreveable/log15.v2" "gopkg.in/inconshreveable/log15.v2/term" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // GetLogger returns a logger suitable for using as logger.Log. diff --git a/shared/netutils/network_linux.go b/shared/netutils/network_linux.go index 009117c5b8a2..4a8018512f6b 100644 --- a/shared/netutils/network_linux.go +++ b/shared/netutils/network_linux.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/websocket" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/logger" ) // WebsocketExecMirror mirrors a websocket connection with a set of Writer/Reader. diff --git a/shared/netutils/network_linux_cgo.go b/shared/netutils/network_linux_cgo.go index bacc1290c352..32663a00d4be 100644 --- a/shared/netutils/network_linux_cgo.go +++ b/shared/netutils/network_linux_cgo.go @@ -11,7 +11,7 @@ import ( "strings" "unsafe" - "github.com/lxc/lxd/shared/api" + "github.com/canonical/lxd/shared/api" ) /* diff --git a/shared/network.go b/shared/network.go index a1fce830c9a6..b681e29afcc6 100644 --- a/shared/network.go +++ b/shared/network.go @@ -16,7 +16,7 @@ import ( "github.com/gorilla/websocket" log "gopkg.in/inconshreveable/log15.v2" - "github.com/lxc/lxd/shared/logger" + "github.com/canonical/lxd/shared/logger" ) // connectErrorPrefix used as prefix to error returned from RFC3493Dialer. diff --git a/shared/simplestreams/products.go b/shared/simplestreams/products.go index f7ed79caad70..e40e3e58f7f7 100644 --- a/shared/simplestreams/products.go +++ b/shared/simplestreams/products.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) // Products represents the base of download.json diff --git a/shared/simplestreams/simplestreams.go b/shared/simplestreams/simplestreams.go index d63579e2c87b..591d9cd4bead 100644 --- a/shared/simplestreams/simplestreams.go +++ b/shared/simplestreams/simplestreams.go @@ -14,9 +14,9 @@ import ( "github.com/pkg/errors" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) var urlDefaultOS = map[string]string{ diff --git a/shared/simplestreams/sort.go b/shared/simplestreams/sort.go index d22b13aff8fb..1ee3f2f17ce5 100644 --- a/shared/simplestreams/sort.go +++ b/shared/simplestreams/sort.go @@ -1,8 +1,8 @@ package simplestreams import ( - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/osarch" ) var nativeName, _ = osarch.ArchitectureGetLocal() diff --git a/shared/subprocess/proc.go b/shared/subprocess/proc.go index c6bb6d2bb637..4f7dd775ed56 100644 --- a/shared/subprocess/proc.go +++ b/shared/subprocess/proc.go @@ -15,7 +15,7 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/lxc/lxd/shared" + "github.com/canonical/lxd/shared" ) // Process struct. Has ability to set runtime arguments diff --git a/shared/util.go b/shared/util.go index fd44f7aaf477..fedadf422358 100644 --- a/shared/util.go +++ b/shared/util.go @@ -27,9 +27,9 @@ import ( "github.com/flosch/pongo2" "github.com/pkg/errors" - "github.com/lxc/lxd/shared/cancel" - "github.com/lxc/lxd/shared/ioprogress" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared/cancel" + "github.com/canonical/lxd/shared/ioprogress" + "github.com/canonical/lxd/shared/units" ) const SnapshotDelimiter = "/" diff --git a/shared/util_linux.go b/shared/util_linux.go index 15d313a1968e..12305bb64d52 100644 --- a/shared/util_linux.go +++ b/shared/util_linux.go @@ -19,8 +19,8 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/lxd/shared/logger" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared/logger" + "github.com/canonical/lxd/shared/units" ) // --- pure Go functions --- diff --git a/shared/util_linux_cgo.go b/shared/util_linux_cgo.go index 61b823c2c67f..1b55c9014396 100644 --- a/shared/util_linux_cgo.go +++ b/shared/util_linux_cgo.go @@ -8,7 +8,7 @@ import ( "os" // Used by cgo - _ "github.com/lxc/lxd/lxd/include" + _ "github.com/canonical/lxd/lxd/include" "golang.org/x/sys/unix" ) diff --git a/shared/validate/validate.go b/shared/validate/validate.go index 5b50391b4c2e..7d988f33b348 100644 --- a/shared/validate/validate.go +++ b/shared/validate/validate.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "github.com/robfig/cron/v3" - "github.com/lxc/lxd/shared/osarch" - "github.com/lxc/lxd/shared/units" + "github.com/canonical/lxd/shared/osarch" + "github.com/canonical/lxd/shared/units" ) // stringInSlice checks whether the supplied string is present in the supplied slice. diff --git a/shared/validate/validate_test.go b/shared/validate/validate_test.go index e1613c089cbe..f71ffa7d5d0c 100644 --- a/shared/validate/validate_test.go +++ b/shared/validate/validate_test.go @@ -3,7 +3,7 @@ package validate_test import ( "fmt" - "github.com/lxc/lxd/shared/validate" + "github.com/canonical/lxd/shared/validate" ) func ExampleIsNetworkMAC() { diff --git a/shared/version/platform_linux.go b/shared/version/platform_linux.go index 983581eb1e72..3707dd8a1522 100644 --- a/shared/version/platform_linux.go +++ b/shared/version/platform_linux.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "strings" - "github.com/lxc/lxd/shared" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared" + "github.com/canonical/lxd/shared/osarch" ) func getPlatformVersionStrings() []string { diff --git a/shared/version/useragent.go b/shared/version/useragent.go index 83bf0475177d..71b46f795ab7 100644 --- a/shared/version/useragent.go +++ b/shared/version/useragent.go @@ -5,7 +5,7 @@ import ( "runtime" "strings" - "github.com/lxc/lxd/shared/osarch" + "github.com/canonical/lxd/shared/osarch" ) // UserAgent contains a string suitable as a user-agent diff --git a/test/godeps.list b/test/godeps.list index c1fc7c381666..92606fb698dd 100644 --- a/test/godeps.list +++ b/test/godeps.list @@ -1,13 +1,13 @@ github.com/gorilla/websocket github.com/juju/persistent-cookiejar -github.com/lxc/lxd/client -github.com/lxc/lxd/shared -github.com/lxc/lxd/shared/api -github.com/lxc/lxd/shared/cancel -github.com/lxc/lxd/shared/ioprogress -github.com/lxc/lxd/shared/logger -github.com/lxc/lxd/shared/simplestreams -github.com/lxc/lxd/shared/units +github.com/canonical/lxd/client +github.com/canonical/lxd/shared +github.com/canonical/lxd/shared/api +github.com/canonical/lxd/shared/cancel +github.com/canonical/lxd/shared/ioprogress +github.com/canonical/lxd/shared/logger +github.com/canonical/lxd/shared/simplestreams +github.com/canonical/lxd/shared/units github.com/pkg/errors gopkg.in/inconshreveable/log15.v2 gopkg.in/juju/environschema.v1/form From f7bda31094e0863da663a26d91833cd51f8d0200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 19 Aug 2022 22:32:46 -0400 Subject: [PATCH 04/87] Makefile: Pin xgettext-go to working version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 033ae33cba1d6d989a212445c41610287b32c280) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21ca2fd4b0bc..0d388ac322e8 100644 --- a/Makefile +++ b/Makefile @@ -223,7 +223,7 @@ update-po: .PHONY: update-pot update-pot: ifeq "$(LXD_OFFLINE)" "" - (cd / ; go get -v -x github.com/snapcore/snapd/i18n/xgettext-go) + (cd / ; go get -v -x github.com/snapcore/snapd/i18n/xgettext-go@2.57.1) endif xgettext-go -o po/$(DOMAIN).pot --add-comments-tag=TRANSLATORS: --sort-output --package-name=$(DOMAIN) --msgid-bugs-address=lxc-devel@lists.linuxcontainers.org --keyword=i18n.G --keyword-plural=i18n.NG lxc/*.go lxc/*/*.go From 55ab7ee98ff8c2ad633945810736d7d98789c511 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 20 Jun 2024 15:28:44 -0400 Subject: [PATCH 05/87] Makefile: pin raft to a specific SHA1 commit Signed-off-by: Simon Deziel --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0d388ac322e8..ea58a453edda 100644 --- a/Makefile +++ b/Makefile @@ -53,9 +53,8 @@ lxd-p2c: .PHONY: deps deps: @if [ ! -e "$(RAFT_PATH)" ]; then \ - git clone --depth=1 "https://github.com/canonical/raft" "$(RAFT_PATH)"; \ - elif [ -e "$(RAFT_PATH)/.git" ]; then \ - cd "$(RAFT_PATH)"; git pull; \ + git clone "https://github.com/canonical/raft" "$(RAFT_PATH)"; \ + cd "$(RAFT_PATH)"; git reset --hard abf9c42a9bb63c24920ab9f0bfbc4b7a47e7e5f4; \ fi cd "$(RAFT_PATH)" && \ From fce9ceee0993dc6fde5ce4c044450cd02f557717 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 20 Jun 2024 15:28:47 -0400 Subject: [PATCH 06/87] Makefile: pin dqlite to a specific SHA1 commit Signed-off-by: Simon Deziel --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ea58a453edda..28e5899aac92 100644 --- a/Makefile +++ b/Makefile @@ -64,9 +64,8 @@ deps: # dqlite @if [ ! -e "$(DQLITE_PATH)" ]; then \ - git clone --depth=1 "https://github.com/canonical/dqlite" "$(DQLITE_PATH)"; \ - elif [ -e "$(DQLITE_PATH)/.git" ]; then \ - cd "$(DQLITE_PATH)"; git pull; \ + git clone "https://github.com/canonical/dqlite" "$(DQLITE_PATH)"; \ + cd "$(DQLITE_PATH)"; git reset --hard 50ee9af350b2fb4e79f9eb58db22c8a0927138de; \ fi cd "$(DQLITE_PATH)" && \ From e6d6c2b0ab07883719eefc315a9325f1f94c85a5 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 20 Jun 2024 15:39:56 -0400 Subject: [PATCH 07/87] lxd: Update instance types URL Signed-off-by: Simon Deziel --- lxd/instance_instance_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxd/instance_instance_types.go b/lxd/instance_instance_types.go index fcc02ce93a7e..f2f161de17fc 100644 --- a/lxd/instance_instance_types.go +++ b/lxd/instance_instance_types.go @@ -111,7 +111,7 @@ func instanceRefreshTypesTask(d *Daemon) (task.Func, task.Schedule) { func instanceRefreshTypes(ctx context.Context, d *Daemon) error { // Attempt to download the new definitions downloadParse := func(filename string, target interface{}) error { - url := fmt.Sprintf("https://images.linuxcontainers.org/meta/instance-types/%s", filename) + url := fmt.Sprintf("https://images.lxd.canonical.com/meta/instance-types/%s", filename) httpClient, err := util.HTTPClient("", d.proxy) if err != nil { From d815ef901affcb3c1b2c561eeee381d688183655 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 2 Aug 2023 15:33:10 -0400 Subject: [PATCH 08/87] github: the sphinx config moved to doc/ This was done in #11837 Signed-off-by: Simon Deziel (cherry picked from commit 6ad0451350696e6830bcf9a4afe68e9388feff75) --- .github/labeler.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index f219e55c5361..0e4b213e1519 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -4,4 +4,3 @@ API: - shared/api/**/* Documentation: - doc/**/* -- .sphinx/**/* From 1d1db47ed81d74999a8807cf69bea13ecd917d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 4 Dec 2023 17:12:35 -0500 Subject: [PATCH 09/87] github: Update for new labeler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber Signed-off-by: Simon Deziel (cherry picked from commit d2d26decc54cb6e98b8cff573e28790f7f8df9b0) --- .github/labeler.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 0e4b213e1519..7a16429d889b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,6 +1,10 @@ API: -- doc/api-extensions.md -- doc/rest-api.yaml -- shared/api/**/* +- changed-files: + - any-glob-to-any-file: + - doc/api-extensions.md + - doc/rest-api.yaml + - shared/api/**/* Documentation: -- doc/**/* +- changed-files: + - any-glob-to-any-file: + - doc/**/* From b18b7a15d3db8996701aa0cf974f60acef5b3631 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 14 Feb 2024 09:31:48 -0500 Subject: [PATCH 10/87] github: add labels when PRs target LTS branches Signed-off-by: Simon Deziel (cherry picked from commit 9323bd28dcb5722b06c24de2a1fe204e087b73f2) --- .github/labeler.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 7a16429d889b..8d43efcc0001 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -8,3 +8,12 @@ Documentation: - changed-files: - any-glob-to-any-file: - doc/**/* + +"5.21 LTS": +- base-branch: 'stable-5.21' + +"5.0 LTS": +- base-branch: 'stable-5.0' + +"4.0 LTS": +- base-branch: 'stable-4.0' From 136efff1df45a64bb085d0ce6e02676860ed2d17 Mon Sep 17 00:00:00 2001 From: Din Music Date: Thu, 18 Jan 2024 17:14:00 +0100 Subject: [PATCH 11/87] lxc/config/default: Remove images remote Signed-off-by: Din Music (cherry picked from commit 9ee455979684f2f9bf4a87e529bc34599c6c46bc) Signed-off-by: Simon Deziel --- lxc/config/default.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lxc/config/default.go b/lxc/config/default.go index b16af972c5af..59d083dfafc8 100644 --- a/lxc/config/default.go +++ b/lxc/config/default.go @@ -7,13 +7,6 @@ var LocalRemote = Remote{ Public: false, } -// ImagesRemote is the community image server (over simplestreams) -var ImagesRemote = Remote{ - Addr: "https://images.linuxcontainers.org", - Public: true, - Protocol: "simplestreams", -} - // UbuntuRemote is the Ubuntu image server (over simplestreams) var UbuntuRemote = Remote{ Addr: "https://cloud-images.ubuntu.com/releases", @@ -39,7 +32,6 @@ var StaticRemotes = map[string]Remote{ // DefaultRemotes is the list of default remotes var DefaultRemotes = map[string]Remote{ - "images": ImagesRemote, "local": LocalRemote, "ubuntu": UbuntuRemote, "ubuntu-daily": UbuntuDailyRemote, From 36f2e944775e5f1b369df131b24c325ed04815c5 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Tue, 2 Apr 2024 14:56:00 +0100 Subject: [PATCH 12/87] lxc/config/default: Add images remote for images.lxd.canonical.com Signed-off-by: Thomas Parrott (cherry picked from commit ed8073c3eeafb2056e30843751d0edc78dec938a) Signed-off-by: Simon Deziel --- lxc/config/default.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lxc/config/default.go b/lxc/config/default.go index 59d083dfafc8..0bac9c909a2b 100644 --- a/lxc/config/default.go +++ b/lxc/config/default.go @@ -7,6 +7,13 @@ var LocalRemote = Remote{ Public: false, } +// ImagesRemote is the main image server (over simplestreams). +var ImagesRemote = Remote{ + Addr: "https://images.lxd.canonical.com", + Public: true, + Protocol: "simplestreams", +} + // UbuntuRemote is the Ubuntu image server (over simplestreams) var UbuntuRemote = Remote{ Addr: "https://cloud-images.ubuntu.com/releases", @@ -26,6 +33,7 @@ var UbuntuDailyRemote = Remote{ // StaticRemotes is the list of remotes which can't be removed var StaticRemotes = map[string]Remote{ "local": LocalRemote, + "images": ImagesRemote, "ubuntu": UbuntuRemote, "ubuntu-daily": UbuntuDailyRemote, } From 7dfc58d2f56035053199255caa5901ae0f29dae9 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 12 Apr 2024 13:39:46 +0100 Subject: [PATCH 13/87] lxd/config/default: Add images to DefaultRemotes Same as the other ubuntu remotes. Signed-off-by: Thomas Parrott (cherry picked from commit 9eabc9c221ba90b416488790c8e1c825d79d182d) Signed-off-by: Simon Deziel --- lxc/config/default.go | 1 + 1 file changed, 1 insertion(+) diff --git a/lxc/config/default.go b/lxc/config/default.go index 0bac9c909a2b..04850dad0987 100644 --- a/lxc/config/default.go +++ b/lxc/config/default.go @@ -41,6 +41,7 @@ var StaticRemotes = map[string]Remote{ // DefaultRemotes is the list of default remotes var DefaultRemotes = map[string]Remote{ "local": LocalRemote, + "images": ImagesRemote, "ubuntu": UbuntuRemote, "ubuntu-daily": UbuntuDailyRemote, } From cfbdeef7d857464cb922d185e440974ad211b3f7 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 20 Jun 2024 16:17:08 -0400 Subject: [PATCH 14/87] *: replace images.linuxcontainers.org by images.lxd.canonical.com Signed-off-by: Simon Deziel --- README.md | 2 +- client/doc.go | 2 +- doc/external_resources.md | 2 +- doc/metadata.yaml | 2 +- doc/rest-api.yaml | 6 +++--- shared/api/image.go | 2 +- shared/api/instance.go | 2 +- shared/util_test.go | 4 ++-- test/suites/remote.sh | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 6c9e3a1a412d..f2f9a126f909 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ LXD is a next generation system container and virtual machine manager. It offers a unified user experience around full Linux systems running inside containers or virtual machines. -It's image based with pre-made images available for a [wide number of Linux distributions](https://images.linuxcontainers.org) +It's image based with pre-made images available for a [wide number of Linux distributions](https://images.lxd.canonical.com) and is built around a very powerful, yet pretty simple, REST API. To get a better idea of what LXD is and what it does, you can [try it online](https://linuxcontainers.org/lxd/try-it/)! diff --git a/client/doc.go b/client/doc.go index f2de2394926c..4352b552e777 100644 --- a/client/doc.go +++ b/client/doc.go @@ -114,7 +114,7 @@ // } // // // Connect to the remote SimpleStreams server -// d, err = lxd.ConnectSimpleStreams("https://images.linuxcontainers.org", nil) +// d, err = lxd.ConnectSimpleStreams("https://images.lxd.canonical.com", nil) // if err != nil { // return err // } diff --git a/doc/external_resources.md b/doc/external_resources.md index f40e2fa76d5a..cd47c84f32c8 100644 --- a/doc/external_resources.md +++ b/doc/external_resources.md @@ -4,5 +4,5 @@ :maxdepth: 1 Project repository -Image server +Image server ``` diff --git a/doc/metadata.yaml b/doc/metadata.yaml index 127f6872c745..373d74f6c954 100644 --- a/doc/metadata.yaml +++ b/doc/metadata.yaml @@ -118,5 +118,5 @@ navigation: external: true - title: Image server - location: https://images.linuxcontainers.org + location: https://images.lxd.canonical.com external: true diff --git a/doc/rest-api.yaml b/doc/rest-api.yaml index fb6d118a4796..cb82830af91f 100644 --- a/doc/rest-api.yaml +++ b/doc/rest-api.yaml @@ -866,7 +866,7 @@ definitions: x-go-name: Protocol server: description: URL of the source server - example: https://images.linuxcontainers.org + example: https://images.lxd.canonical.com type: string x-go-name: Server type: object @@ -982,7 +982,7 @@ definitions: x-go-name: Secret server: description: URL of the source server - example: https://images.linuxcontainers.org + example: https://images.lxd.canonical.com type: string x-go-name: Server type: @@ -1802,7 +1802,7 @@ definitions: x-go-name: Websockets server: description: Remote server URL (for remote images) - example: https://images.linuxcontainers.org + example: https://images.lxd.canonical.com type: string x-go-name: Server source: diff --git a/shared/api/image.go b/shared/api/image.go index 6e36d0c8b81d..b85dd59e4397 100644 --- a/shared/api/image.go +++ b/shared/api/image.go @@ -204,7 +204,7 @@ type ImageSource struct { Protocol string `json:"protocol" yaml:"protocol"` // URL of the source server - // Example: https://images.linuxcontainers.org + // Example: https://images.lxd.canonical.com Server string `json:"server" yaml:"server"` // Type of image (container or virtual-machine) diff --git a/shared/api/instance.go b/shared/api/instance.go index 42494cd0c09c..5a7a98340d33 100644 --- a/shared/api/instance.go +++ b/shared/api/instance.go @@ -267,7 +267,7 @@ type InstanceSource struct { Properties map[string]string `json:"properties,omitempty" yaml:"properties,omitempty"` // Remote server URL (for remote images) - // Example: https://images.linuxcontainers.org + // Example: https://images.lxd.canonical.com Server string `json:"server,omitempty" yaml:"server,omitempty"` // Remote server secret (for remote private images) diff --git a/shared/util_test.go b/shared/util_test.go index 9d5a91d8acee..5bd266a6afac 100644 --- a/shared/util_test.go +++ b/shared/util_test.go @@ -25,7 +25,7 @@ func TestURLEncode(t *testing.T) { } func TestUrlsJoin(t *testing.T) { - baseUrl := "http://images.linuxcontainers.org/streams/v1/" + baseUrl := "http://images.lxd.canonical.com/streams/v1/" path := "../../image/root.tar.xz" res, err := JoinUrls(baseUrl, path) @@ -34,7 +34,7 @@ func TestUrlsJoin(t *testing.T) { return } - expected := "http://images.linuxcontainers.org/image/root.tar.xz" + expected := "http://images.lxd.canonical.com/image/root.tar.xz" if res != expected { t.Error(fmt.Errorf("'%s' != '%s'", res, expected)) } diff --git a/test/suites/remote.sh b/test/suites/remote.sh index ee8f2ae4641b..ea3b88cbda13 100644 --- a/test/suites/remote.sh +++ b/test/suites/remote.sh @@ -12,7 +12,7 @@ test_remote_url() { # shellcheck disable=2153 urls="${LXD_DIR}/unix.socket unix:${LXD_DIR}/unix.socket unix://${LXD_DIR}/unix.socket" if [ -z "${LXD_OFFLINE:-}" ]; then - urls="images.linuxcontainers.org https://images.linuxcontainers.org ${urls}" + urls="images.lxd.canonical.com https://images.lxd.canonical.com ${urls}" fi # an invalid protocol returns an error @@ -65,8 +65,8 @@ test_remote_admin() { # Check that we can add domains with valid certs without confirmation: if [ -z "${LXD_OFFLINE:-}" ]; then - lxc_remote remote add images1 images.linuxcontainers.org - lxc_remote remote add images2 images.linuxcontainers.org:443 + lxc_remote remote add images1 images.lxd.canonical.com + lxc_remote remote add images2 images.lxd.canonical.com:443 lxc_remote remote remove images1 lxc_remote remote remove images2 fi From bb5213cb3552f592499746b761f0fe385026f6db Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Mon, 24 Jun 2024 11:15:13 +0100 Subject: [PATCH 15/87] test: Flush routes on lo interface left over from liblxc ipvlan bug Later versions appear to be setting up routes on container start, but leaving them behind on container stop. LXD doesn't use liblxc's route management in later versions so this is just to get the test suite passing. Signed-off-by: Thomas Parrott (cherry picked from commit 29a04ebfe396ef93154e977e3dfdc186f30aa9e5) Signed-off-by: Simon Deziel --- test/suites/container_devices_nic_ipvlan.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/suites/container_devices_nic_ipvlan.sh b/test/suites/container_devices_nic_ipvlan.sh index 5a3fceaa9661..0697e8717234 100644 --- a/test/suites/container_devices_nic_ipvlan.sh +++ b/test/suites/container_devices_nic_ipvlan.sh @@ -36,6 +36,8 @@ test_container_devices_nic_ipvlan() { fi lxc stop "${ctName}" --force + ip -4 route flush dev lo + ip -6 route flush dev lo # Check that MTU is inherited from parent device when not specified on device. ip link set "${ctName}" mtu 1405 @@ -66,6 +68,9 @@ test_container_devices_nic_ipvlan() { # Check IPVLAN ontop of VLAN parent. lxc stop -f "${ctName}" + ip -4 route flush dev lo + ip -6 route flush dev lo + lxc config device set "${ctName}" eth0 vlan 1234 lxc start "${ctName}" @@ -99,4 +104,6 @@ test_container_devices_nic_ipvlan() { lxc delete "${ctName}" -f lxc delete "${ctName}2" -f ip link delete "${ctName}" type dummy + ip -4 route flush dev lo + ip -6 route flush dev lo } From ccebbda6165722fd76548a04b0b09de6e9b9e419 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Mon, 14 Mar 2022 12:34:29 +0000 Subject: [PATCH 16/87] test: Fix container devices nic bridged filtering tests on recent versions of nftables Signed-off-by: Thomas Parrott (cherry picked from commit 68e2d7549a8631a6723f1efa983d68d13b7fc601) Signed-off-by: Simon Deziel --- ...container_devices_nic_bridged_filtering.sh | 49 ++++++++++++------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/test/suites/container_devices_nic_bridged_filtering.sh b/test/suites/container_devices_nic_bridged_filtering.sh index edc448f6d011..ee1981e410e4 100644 --- a/test/suites/container_devices_nic_bridged_filtering.sh +++ b/test/suites/container_devices_nic_bridged_filtering.sh @@ -75,18 +75,21 @@ test_container_devices_nic_bridged_filtering() { else macHex=$(echo "${ctAMAC}" |sed "s/://g") macDec=$(printf "%d" 0x"${macHex}") + macHex=$(printf "0x%x" "${macDec}") for table in "in" "fwd" do - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep -e "iifname \"${ctAHost}\" ether saddr != ${ctAMAC} drop"; then + rules=$(nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0") + + if ! echo "${rules}" | grep -e "iifname \"${ctAHost}\" ether saddr != ${ctAMAC} drop"; then echo "MAC filter not applied as part of mac_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep -e "iifname \"${ctAHost}\" arp saddr ether != ${ctAMAC} drop"; then + if ! echo "${rules}" | grep -e "iifname \"${ctAHost}\" arp saddr ether != ${ctAMAC} drop"; then echo "MAC ARP filter not applied as part of mac_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" icmpv6 type 136 @nh,528,48 != ${macDec} drop"; then + if ! echo "${rules}" | grep -P "iifname \"${ctAHost}\" icmpv6 type 136 @nh,528,48 != (${macHex}|${macDec}) drop"; then echo "MAC NDP filter not applied as part of mac_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi @@ -315,31 +318,35 @@ test_container_devices_nic_bridged_filtering() { fi else macDec=$(printf "%d" 0x"${macHex}") + macHex=$(printf "0x%x" "${macDec}") + ipv6Hex="0x20010db8000000000000000000000002" ipv6Dec="42540766411282592856903984951653826562" + rules=$(nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0") + for table in "in" "fwd" do - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" ether saddr != ${ctAMAC} drop"; then + if ! echo "${rules}" | grep "iifname \"${ctAHost}\" ether saddr != ${ctAMAC} drop"; then echo "MAC filter not applied as part of ipv6_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" arp saddr ether != ${ctAMAC} drop"; then + if ! echo "${rules}" | grep "iifname \"${ctAHost}\" arp saddr ether != ${ctAMAC} drop"; then echo "MAC ARP filter not applied as part of ipv6_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" icmpv6 type 136 @nh,528,48 != ${macDec} drop"; then + if ! echo "${rules}" | grep -P "iifname \"${ctAHost}\" icmpv6 type 136 @nh,528,48 != (${macHex}|${macDec}) drop"; then echo "MAC NDP filter not applied as part of ipv6_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" icmpv6 type 136 @nh,384,128 != ${ipv6Dec} drop"; then + if ! echo "${rules}" | grep -P "iifname \"${ctAHost}\" icmpv6 type 136 @nh,384,128 != (${ipv6Hex}|${ipv6Dec}) drop"; then echo "IPv6 NDP filter not applied as part of ipv6_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" ip6 saddr != 2001:db8::2 drop"; then + if ! echo "${rules}" | grep "iifname \"${ctAHost}\" ip6 saddr != 2001:db8::2 drop"; then echo "IPv6 filter not applied as part of ipv6_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep -e "iifname \"${ctAHost}\" icmpv6 type 134 drop"; then + if ! echo "${rules}" | grep -e "iifname \"${ctAHost}\" icmpv6 type 134 drop"; then echo "IPv6 RA filter not applied as part of ipv6_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi @@ -495,29 +502,34 @@ test_container_devices_nic_bridged_filtering() { false fi else + macHex=$(echo "${ctAMAC}" |sed "s/://g") macDec=$(printf "%d" 0x"${macHex}") + macHex=$(printf "0x%x" "${macDec}") + ipv6Hex="0x20010db8000000000000000000000002" ipv6Dec="42540766411282592856903984951653826562" + rules=$(nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0") + for table in "in" "fwd" do - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" ether saddr != ${ctAMAC} drop"; then + if ! echo "${rules}" | grep "iifname \"${ctAHost}\" ether saddr != ${ctAMAC} drop"; then echo "MAC filter not applied as part of ipv4_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" arp saddr ether != ${ctAMAC} drop"; then + if ! echo "${rules}" | grep "iifname \"${ctAHost}\" arp saddr ether != ${ctAMAC} drop"; then echo "MAC ARP filter not applied as part of ipv4_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" icmpv6 type 136 @nh,528,48 != ${macDec} drop"; then + if ! echo "${rules}" | grep -P "iifname \"${ctAHost}\" icmpv6 type 136 @nh,528,48 != (${macHex}|${macDec}) drop"; then echo "MAC NDP filter not applied as part of ipv6_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" icmpv6 type 136 @nh,384,128 != ${ipv6Dec} drop"; then + if ! echo "${rules}" | grep -P "iifname \"${ctAHost}\" icmpv6 type 136 @nh,384,128 != (${ipv6Hex}|${ipv6Dec}) drop"; then echo "IPv6 NDP filter not applied as part of ipv6_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" ip6 saddr != 2001:db8::2 drop"; then + if ! echo "${rules}" | grep "iifname \"${ctAHost}\" ip6 saddr != 2001:db8::2 drop"; then echo "IPv6 filter not applied as part of ipv6_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi @@ -577,19 +589,22 @@ test_container_devices_nic_bridged_filtering() { else macHex=$(echo "${ctAMAC}" |sed "s/://g") macDec=$(printf "%d" 0x"${macHex}") + macHex=$(printf "0x%x" "${macDec}") + + rules=$(nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0") for table in "in" "fwd" do - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" ether saddr != ${ctAMAC} drop"; then + if ! echo "${rules}" | grep "iifname \"${ctAHost}\" ether saddr != ${ctAMAC} drop"; then echo "MAC filter not applied as part of mac_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" arp saddr ether != ${ctAMAC} drop"; then + if ! echo "${rules}" | grep "iifname \"${ctAHost}\" arp saddr ether != ${ctAMAC} drop"; then echo "MAC ARP filter not applied as part of mac_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi - if ! nft -nn list chain bridge lxd "${table}.${ctPrefix}A.eth0" | grep "iifname \"${ctAHost}\" icmpv6 type 136 @nh,528,48 != ${macDec} drop"; then + if ! echo "${rules}" | grep -P "iifname \"${ctAHost}\" icmpv6 type 136 @nh,528,48 != (${macHex}|${macDec}) drop"; then echo "MAC NDP filter not applied as part of mac_filtering in nftables (${table}.${ctPrefix}A.eth0)" false fi From 91d9fc36860ec4938dc93f5c3d98261d70d34107 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Mon, 24 Jun 2024 15:21:43 +0100 Subject: [PATCH 17/87] lxd/instance/drivers/driver/lxc: Add support for disabling idmapped mounts via LXD_IDMAPPED_MOUNTS_DISABLE env var Signed-off-by: Thomas Parrott (cherry picked from commit 27713f68a4ea396480c1f9a7391aae4e29474403) Signed-off-by: Simon Deziel --- lxd/instance/drivers/driver_lxc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxd/instance/drivers/driver_lxc.go b/lxd/instance/drivers/driver_lxc.go index b6586c607c36..eff5f83958b3 100644 --- a/lxd/instance/drivers/driver_lxc.go +++ b/lxd/instance/drivers/driver_lxc.go @@ -1308,7 +1308,7 @@ func (d *lxc) IdmappedStorage(path string) idmap.IdmapStorageType { mode = idmap.IdmapStorageShiftfs } - if !d.state.OS.LXCFeatures["idmapped_mounts_v2"] { + if !d.state.OS.LXCFeatures["idmapped_mounts_v2"] || shared.IsTrue(os.Getenv("LXD_IDMAPPED_MOUNTS_DISABLE")) { return mode } From 45e564018e2817555e2a821d28550fafeb9c8ff1 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Tue, 27 Sep 2022 15:17:56 +0100 Subject: [PATCH 18/87] test: Fix manual shifting protection tests by disabling kernel shifting Signed-off-by: Thomas Parrott (cherry picked from commit c6db0033d9ed730911e66d055b7ecc26a1a3d78a) Signed-off-by: Simon Deziel --- test/suites/security.sh | 65 +++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/test/suites/security.sh b/test/suites/security.sh index b93d52aba9b6..da5c0faed09a 100644 --- a/test/suites/security.sh +++ b/test/suites/security.sh @@ -163,29 +163,44 @@ test_security_protection() { lxc profile unset default security.protection.delete # Test shifting protection - if ! grep -q shiftfs /proc/filesystems; then - lxc init testimage c1 - lxc start c1 - lxc stop c1 --force - - lxc profile set default security.protection.shift true - lxc start c1 - lxc stop c1 --force - - lxc publish c1 --alias=protected - lxc image delete protected - - lxc snapshot c1 - lxc publish c1/snap0 --alias=protected - lxc image delete protected - - lxc config set c1 security.privileged true - ! lxc start c1 || false - lxc config set c1 security.protection.shift false - lxc start c1 - lxc stop c1 --force - - lxc delete c1 - lxc profile unset default security.protection.shift - fi + + # Respawn LXD with kernel ID shifting support disabled to force manual shifting. + shutdown_lxd "${LXD_DIR}" + lxdShiftfsDisable=${LXD_SHIFTFS_DISABLE:-} + lxdIdmappedMountsDisable=${LXD_IDMAPPED_MOUNTS_DISABLE:-} + + export LXD_SHIFTFS_DISABLE=1 + export LXD_IDMAPPED_MOUNTS_DISABLE=1 + respawn_lxd "${LXD_DIR}" true + + lxc init testimage c1 + lxc start c1 + lxc stop c1 --force + + lxc profile set default security.protection.shift true + lxc start c1 + lxc stop c1 --force + + lxc publish c1 --alias=protected + lxc image delete protected + + lxc snapshot c1 + lxc publish c1/snap0 --alias=protected + lxc image delete protected + + lxc config set c1 security.privileged true + ! lxc start c1 || false + lxc config set c1 security.protection.shift false + lxc start c1 + lxc stop c1 --force + + lxc delete c1 + lxc profile unset default security.protection.shift + + # Respawn LXD to restore default kernel shifting support. + shutdown_lxd "${LXD_DIR}" + export LXD_SHIFTFS_DISABLE="${lxdShiftfsDisable}" + export LXD_IDMAPPED_MOUNTS_DISABLE="${lxdIdmappedMountsDisable}" + + respawn_lxd "${LXD_DIR}" true } From fd484ee280b7894a7a152fba4c2ce89b6c23f6ad Mon Sep 17 00:00:00 2001 From: Mark Laing Date: Mon, 24 Jun 2024 15:23:00 +0000 Subject: [PATCH 19/87] test: Order client dependencies alphabetically. Signed-off-by: Mark Laing (cherry picked from commit ecc9eff4ad2269c82e4144240a152c6f37321ace) Signed-off-by: Simon Deziel --- test/godeps.list | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/godeps.list b/test/godeps.list index 92606fb698dd..d8c35490eaee 100644 --- a/test/godeps.list +++ b/test/godeps.list @@ -1,5 +1,3 @@ -github.com/gorilla/websocket -github.com/juju/persistent-cookiejar github.com/canonical/lxd/client github.com/canonical/lxd/shared github.com/canonical/lxd/shared/api @@ -8,6 +6,8 @@ github.com/canonical/lxd/shared/ioprogress github.com/canonical/lxd/shared/logger github.com/canonical/lxd/shared/simplestreams github.com/canonical/lxd/shared/units +github.com/gorilla/websocket +github.com/juju/persistent-cookiejar github.com/pkg/errors gopkg.in/inconshreveable/log15.v2 gopkg.in/juju/environschema.v1/form From 23945a977aecbb2358ef95cddd1409d2fda01e26 Mon Sep 17 00:00:00 2001 From: Mark Laing Date: Mon, 24 Jun 2024 17:48:41 +0100 Subject: [PATCH 20/87] *: Runs `gofmt -w -s ./`. This is required for static analysis to pass. Signed-off-by: Mark Laing (cherry picked from commit 3631eb6db413607eaf68825200b0c5c1a3195fea) Signed-off-by: Simon Deziel --- client/lxd_events.go | 2 +- lxd-agent/devlxd.go | 2 +- lxd/api.go | 2 +- lxd/cluster/migrate.go | 2 +- lxd/events/devlxdEvents.go | 2 +- lxd/events/events.go | 2 +- lxd/instance_delete.go | 2 +- lxd/instance_get.go | 2 +- lxd/storage_volumes.go | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/lxd_events.go b/client/lxd_events.go index 31d2c366ea6b..670e3cfee8d1 100644 --- a/client/lxd_events.go +++ b/client/lxd_events.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - "github.com/gorilla/websocket" "github.com/canonical/lxd/shared" "github.com/canonical/lxd/shared/api" + "github.com/gorilla/websocket" ) // Event handling functions diff --git a/lxd-agent/devlxd.go b/lxd-agent/devlxd.go index f629f730e32e..988721052ce0 100644 --- a/lxd-agent/devlxd.go +++ b/lxd-agent/devlxd.go @@ -10,12 +10,12 @@ import ( "path/filepath" "strings" - "github.com/gorilla/mux" "github.com/canonical/lxd/lxd/daemon" "github.com/canonical/lxd/lxd/util" "github.com/canonical/lxd/shared" "github.com/canonical/lxd/shared/logger" "github.com/canonical/lxd/shared/version" + "github.com/gorilla/mux" ) // DevLxdServer creates an http.Server capable of handling requests against the diff --git a/lxd/api.go b/lxd/api.go index d0392f7c492b..d9482d1a2775 100644 --- a/lxd/api.go +++ b/lxd/api.go @@ -7,7 +7,6 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/gorilla/mux" "github.com/canonical/lxd/lxd/cluster" "github.com/canonical/lxd/lxd/cluster/request" "github.com/canonical/lxd/lxd/db" @@ -15,6 +14,7 @@ import ( lxdRequest "github.com/canonical/lxd/lxd/request" "github.com/canonical/lxd/lxd/response" "github.com/canonical/lxd/shared/logger" + "github.com/gorilla/mux" ) // swagger:operation GET / server api_get diff --git a/lxd/cluster/migrate.go b/lxd/cluster/migrate.go index ea9f58076a35..e9575a446baa 100644 --- a/lxd/cluster/migrate.go +++ b/lxd/cluster/migrate.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strconv" - "github.com/hashicorp/go-msgpack/codec" "github.com/canonical/lxd/lxd/cluster/raft" "github.com/canonical/lxd/shared" + "github.com/hashicorp/go-msgpack/codec" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" ) diff --git a/lxd/events/devlxdEvents.go b/lxd/events/devlxdEvents.go index d8674135eca2..ab5c84782be3 100644 --- a/lxd/events/devlxdEvents.go +++ b/lxd/events/devlxdEvents.go @@ -8,9 +8,9 @@ import ( "github.com/pborman/uuid" - "github.com/gorilla/websocket" "github.com/canonical/lxd/shared" "github.com/canonical/lxd/shared/api" + "github.com/gorilla/websocket" ) // DevLXDServer represents an instance of an devlxd event server. diff --git a/lxd/events/events.go b/lxd/events/events.go index b7c2ca0cf6be..6106b799e67e 100644 --- a/lxd/events/events.go +++ b/lxd/events/events.go @@ -8,10 +8,10 @@ import ( "github.com/pborman/uuid" - "github.com/gorilla/websocket" "github.com/canonical/lxd/shared" "github.com/canonical/lxd/shared/api" "github.com/canonical/lxd/shared/logger" + "github.com/gorilla/websocket" ) // Server represents an instance of an event server. diff --git a/lxd/instance_delete.go b/lxd/instance_delete.go index af63ee1a148a..a95b496959c3 100644 --- a/lxd/instance_delete.go +++ b/lxd/instance_delete.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "github.com/gorilla/mux" "github.com/canonical/lxd/lxd/db" "github.com/canonical/lxd/lxd/instance" "github.com/canonical/lxd/lxd/instance/instancetype" "github.com/canonical/lxd/lxd/operations" "github.com/canonical/lxd/lxd/response" + "github.com/gorilla/mux" ) // swagger:operation DELETE /1.0/instances/{name} instances instance_delete diff --git a/lxd/instance_get.go b/lxd/instance_get.go index 1ffe9e95c559..dbfafb3c656a 100644 --- a/lxd/instance_get.go +++ b/lxd/instance_get.go @@ -3,9 +3,9 @@ package main import ( "net/http" - "github.com/gorilla/mux" "github.com/canonical/lxd/lxd/instance" "github.com/canonical/lxd/lxd/response" + "github.com/gorilla/mux" ) // swagger:operation GET /1.0/instances/{name} instances instance_get diff --git a/lxd/storage_volumes.go b/lxd/storage_volumes.go index e3cfa2cb0930..bd32c9941cc5 100644 --- a/lxd/storage_volumes.go +++ b/lxd/storage_volumes.go @@ -11,8 +11,6 @@ import ( log "gopkg.in/inconshreveable/log15.v2" - "github.com/gorilla/mux" - "github.com/gorilla/websocket" "github.com/canonical/lxd/lxd/db" "github.com/canonical/lxd/lxd/instance" "github.com/canonical/lxd/lxd/operations" @@ -26,6 +24,8 @@ import ( "github.com/canonical/lxd/shared/api" "github.com/canonical/lxd/shared/logger" "github.com/canonical/lxd/shared/version" + "github.com/gorilla/mux" + "github.com/gorilla/websocket" ) var storagePoolVolumesCmd = APIEndpoint{ From e8ffa10cf32f033479859b2e4692137fac7a6949 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Tue, 25 Jun 2024 16:45:23 -0400 Subject: [PATCH 21/87] github: adapt snap build job from main branch Signed-off-by: Simon Deziel (cherry picked from commit 671b7489463e8177dc7e69b02d638b971624dcef) --- .github/workflows/test.yml | 55 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7289fa582b93..94752af33f33 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,3 +64,58 @@ jobs: with: name: ${{ runner.os }} path: bin/ + + snap: + name: Trigger snap edge build + runs-on: ubuntu-22.04 + needs: [test] + if: ${{ github.repository == 'canonical/lxd' && github.event_name == 'push' && github.actor != 'dependabot[bot]' }} + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup Launchpad SSH access + env: + SSH_AUTH_SOCK: /tmp/ssh_agent.sock + LAUNCHPAD_LXD_BOT_KEY: ${{ secrets.LAUNCHPAD_LXD_BOT_KEY }} + run: | + set -eux + mkdir -m 0700 -p ~/.ssh/ + ssh-agent -a "${SSH_AUTH_SOCK}" > /dev/null + ssh-add - <<< "${{ secrets.LAUNCHPAD_LXD_BOT_KEY }}" + ssh-add -L > ~/.ssh/id_ed25519.pub + # In ephemeral environments like GitHub Action runners, relying on TOFU isn't providing any security + # so require the key obtained by `ssh-keyscan` to match the expected hash from https://help.launchpad.net/SSHFingerprints + ssh-keyscan git.launchpad.net >> ~/.ssh/known_hosts + ssh-keygen -qlF git.launchpad.net | grep -xF 'git.launchpad.net RSA SHA256:UNOzlP66WpDuEo34Wgs8mewypV0UzqHLsIFoqwe8dYo' + + - name: Install Go + uses: actions/setup-go@v5 + with: + go-version: 1.22.x + + - name: Trigger Launchpad snap build + env: + SSH_AUTH_SOCK: /tmp/ssh_agent.sock + TARGET: >- + ${{ fromJson('{ + "main": "latest-edge", + "stable-4.0": "4.0-edge", + }')[github.ref_name] }} + run: | + set -eux + git config --global transfer.fsckobjects true + git config --global user.name "Canonical LXD Bot" + git config --global user.email "lxd@lists.canonical.com" + git config --global commit.gpgsign true + git config --global gpg.format "ssh" + git config --global user.signingkey ~/.ssh/id_ed25519.pub + localRev="$(git rev-parse HEAD)" + go install github.com/canonical/lxd-ci/lxd-snapcraft@latest + git clone -b "${TARGET}" git+ssh://lxdbot@git.launchpad.net/~canonical-lxd/lxd ~/lxd-pkg-snap-lp + cd ~/lxd-pkg-snap-lp + lxd-snapcraft -package lxd -set-version "git-${localRev:0:7}" -set-source-commit "${localRev}" + git add --all + git commit --all --quiet -s --allow-empty -m "Automatic upstream build (${TARGET})" -m "Upstream commit: ${localRev}" + git show + git push --quiet From c5efb78e6f8a8795e607bcd35b15f463b979b703 Mon Sep 17 00:00:00 2001 From: Din Music Date: Mon, 4 Sep 2023 10:27:26 +0200 Subject: [PATCH 22/87] lxd/config: Add ubuntu-minimal and ubuntu-minimal-daily remotes Signed-off-by: Din Music (cherry picked from commit b365672a32e3edff0d92a39ea65b40317e230934) Signed-off-by: Simon Deziel --- lxc/config/default.go | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/lxc/config/default.go b/lxc/config/default.go index 04850dad0987..30954885597e 100644 --- a/lxc/config/default.go +++ b/lxc/config/default.go @@ -30,20 +30,40 @@ var UbuntuDailyRemote = Remote{ Protocol: "simplestreams", } +// UbuntuMinimalRemote is the Ubuntu minimal image server (over simplestreams). +var UbuntuMinimalRemote = Remote{ + Addr: "https://cloud-images.ubuntu.com/minimal/releases/", + Static: true, + Public: true, + Protocol: "simplestreams", +} + +// UbuntuMinimalDailyRemote is the Ubuntu daily minimal image server (over simplestreams). +var UbuntuMinimalDailyRemote = Remote{ + Addr: "https://cloud-images.ubuntu.com/minimal/daily/", + Static: true, + Public: true, + Protocol: "simplestreams", +} + // StaticRemotes is the list of remotes which can't be removed var StaticRemotes = map[string]Remote{ - "local": LocalRemote, - "images": ImagesRemote, - "ubuntu": UbuntuRemote, - "ubuntu-daily": UbuntuDailyRemote, + "images": ImagesRemote, + "local": LocalRemote, + "ubuntu": UbuntuRemote, + "ubuntu-daily": UbuntuDailyRemote, + "ubuntu-minimal": UbuntuMinimalRemote, + "ubuntu-minimal-daily": UbuntuMinimalDailyRemote, } // DefaultRemotes is the list of default remotes var DefaultRemotes = map[string]Remote{ - "local": LocalRemote, - "images": ImagesRemote, - "ubuntu": UbuntuRemote, - "ubuntu-daily": UbuntuDailyRemote, + "images": ImagesRemote, + "local": LocalRemote, + "ubuntu": UbuntuRemote, + "ubuntu-daily": UbuntuDailyRemote, + "ubuntu-minimal": UbuntuMinimalRemote, + "ubuntu-minimal-daily": UbuntuMinimalDailyRemote, } // DefaultConfig is the default configuration From 2c7a5b7307510caabee049fc04cad05e0fa7d000 Mon Sep 17 00:00:00 2001 From: Din Music Date: Thu, 18 Jan 2024 17:15:35 +0100 Subject: [PATCH 23/87] lxd-benchmark: Use image from ubuntu remote in description Signed-off-by: Din Music (cherry picked from commit 413b8c5fbbedf9d6ce58d94b304bcc9623b4d8ec) Signed-off-by: Simon Deziel --- lxd-benchmark/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lxd-benchmark/main.go b/lxd-benchmark/main.go index b8aa1573ff34..16ff0ab651ca 100644 --- a/lxd-benchmark/main.go +++ b/lxd-benchmark/main.go @@ -88,8 +88,8 @@ func main() { app.Example = ` # Spawn 20 Ubuntu containers in batches of 4 lxd-benchmark launch --count 20 --parallel 4 - # Create 50 Alpine containers in batches of 10 - lxd-benchmark init --count 50 --parallel 10 images:alpine/edge + # Create 50 Ubuntu Minimal 22.04 containers in batches of 10 + lxd-benchmark init --count 50 --parallel 10 ubuntu-minimal:22.04 # Delete all test containers using dynamic batch size lxd-benchmark delete` From 21b512126e11e403aed01b2f50e215fa29bb3b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 10 Feb 2022 13:22:36 -0500 Subject: [PATCH 24/87] github: Update for current min Go version (1.16) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit b15a9cf04a6e71b1b6b178b1656aefcef9d5c8db) Signed-off-by: Simon Deziel --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 94752af33f33..89a9b3ca77c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,6 @@ jobs: fail-fast: false matrix: go: - - 1.13.x - 1.16.x - 1.17.x os: From 0ff6cda5a1dffd60f014550fbea1d0ae394b6fe6 Mon Sep 17 00:00:00 2001 From: Mark Laing Date: Thu, 3 Feb 2022 16:56:56 +0000 Subject: [PATCH 25/87] doc: Clarify multiple GPU device passthrough for VMs. Signed-off-by: Mark Laing (cherry picked from commit 71f6e9a2f1712db58e664ac1f4b28083d35a74a3) Signed-off-by: Simon Deziel --- doc/instances.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/instances.md b/doc/instances.md index 022c0ebadc2a..2ade6ffa8c86 100644 --- a/doc/instances.md +++ b/doc/instances.md @@ -759,6 +759,10 @@ required | boolean | false | no | Whether or not this de GPU device entries simply make the requested gpu device appear in the instance. +```{note} +Container devices may match multiple GPUs at once. However, for virtual machines a device can only match a single GPU. +``` + ##### GPUs Available: The following GPUs can be specified using the `gputype` property: From ea6110747a8e0b96c9ffdffc223207564477964c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Feb 2022 17:04:07 -0500 Subject: [PATCH 26/87] doc: Add basic instance exec information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #9862 Signed-off-by: Stéphane Graber (cherry picked from commit c8de72ca08bda7fc482bb624a5f68ae04f7e670f) Signed-off-by: Simon Deziel --- doc/instance-exec.md | 51 ++++++++++++++++++++++++++++++++++++++++++++ doc/metadata.yaml | 3 +++ doc/operation.md | 1 + 3 files changed, 55 insertions(+) create mode 100644 doc/instance-exec.md diff --git a/doc/instance-exec.md b/doc/instance-exec.md new file mode 100644 index 000000000000..2937e6ec166d --- /dev/null +++ b/doc/instance-exec.md @@ -0,0 +1,51 @@ +# Instance command execution +LXD makes it easy to run a command inside a given instance. +For containers, this always works and is handled directly by LXD. +For virtual machines, this relies on the `lxd-agent` process running inside of the virtual machine. + +At the CLI level, this is achieved through the `lxc exec` command which +supports specifying not only the command to executed but also the +execution mode, user, group and working directory. + +At the API level, this is done through `/1.0/instances/NAME/exec`. + +## Execution mode +LXD can execute commands either interactively or non-interactively. + +In interactive mode, a pseudo-terminal device (PTS) will be used to handle input (stdin) and output (stdout, stderr). +This is automatically selected by the CLI if connected to a terminal emulator (not run from a script). + +In non-interactive mode, pipes are allocated instead, one for each of stdin, stdout and stderr. +This allows running a command and properly getting separate stdin, stdout and stderr as required by many scripts. + +## User, groups and working directory +LXD has a policy not to read data from within the instances or trusting anything that can be found in it. +This means that LXD will not be parsing things like `/etc/passwd`, `/etc/group` or `/etc/nsswitch.conf` +to handle user and group resolution. + +As a result, LXD also doesn't know where the home directory for the user +may be or what supplementary groups the user may be in. + +By default, LXD will run the command as root (uid 0) with the default group (gid 0) +and the working directory set to /root. + +The user, group and working directory can all be overridden but absolute values (uid, gid, path) +have to be provided as LXD will not do any resolution for you. + +## Environment +The environment variables set during an exec session come from a few sources: + - `environment.KEY=VALUE` directly set on the instance + - Environment variables directly passed during the exec session + - Default variables set by LXD + +For that last category, LXD will set the `PATH` to `/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin` +and extend it with `/snap` and `/etc/NIXOS` if applicable. +Additionally `LANG` will be set to `C.UTF-8`. + +When running as root (uid 0), the following variables will also be set: + - `HOME` to `/root` + - `USER` to `root` + +When running as another user, it is the responsibility of the user to specify the correct values. + +Those defaults only get set if they're not in the instance configuration or directly overridden for the exec session. diff --git a/doc/metadata.yaml b/doc/metadata.yaml index 373d74f6c954..7d0a50e0639a 100644 --- a/doc/metadata.yaml +++ b/doc/metadata.yaml @@ -68,6 +68,9 @@ navigation: - title: Clustering location: clustering.md + - title: Instance command execution + location: instance-exec.md + - title: Production setup location: production-setup.md diff --git a/doc/operation.md b/doc/operation.md index f49cf5bd94e7..ee4031262b64 100644 --- a/doc/operation.md +++ b/doc/operation.md @@ -5,6 +5,7 @@ Backups clustering +instance-exec production-setup authentication ``` From bda5281077fd2784ada0bad89085c998c5572177 Mon Sep 17 00:00:00 2001 From: Ruth Fuchss Date: Tue, 8 Feb 2022 10:21:05 +0100 Subject: [PATCH 27/87] doc: use local image Use local image instead of online image. Signed-off-by: Ruth Fuchss (cherry picked from commit 5de8c07b67dbf2e881852a099fb06b4a27cd5d16) Signed-off-by: Simon Deziel --- README.md | 2 ++ doc/index.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index f2f9a126f909..b1444212ae23 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ [![LXD](https://linuxcontainers.org/static/img/containers.png)](https://linuxcontainers.org/lxd) + + # LXD LXD is a next generation system container and virtual machine manager. It offers a unified user experience around full Linux systems running inside containers or virtual machines. diff --git a/doc/index.md b/doc/index.md index ad4129c55ab3..8ab5592a8692 100644 --- a/doc/index.md +++ b/doc/index.md @@ -1,6 +1,8 @@ +[![LXD](../.sphinx/_static/download/containers.png)](https://linuxcontainers.org/lxd) % Include content from [../README.md](../README.md) ```{include} ../README.md + :start-after: :end-before: ``` From eeb02cefd967c499d3edb3d46e94170782eb4b51 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Thu, 24 Feb 2022 16:51:10 +0000 Subject: [PATCH 28/87] doc/instances: Removes trailing whitespace Signed-off-by: Thomas Parrott (cherry picked from commit 4dfd401fe0120eae5995e4ff7428c3969b77269f) Signed-off-by: Simon Deziel --- doc/instances.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/instances.md b/doc/instances.md index 2ade6ffa8c86..929c19686639 100644 --- a/doc/instances.md +++ b/doc/instances.md @@ -760,7 +760,7 @@ GPU device entries simply make the requested gpu device appear in the instance. ```{note} -Container devices may match multiple GPUs at once. However, for virtual machines a device can only match a single GPU. +Container devices may match multiple GPUs at once. However, for virtual machines a device can only match a single GPU. ``` ##### GPUs Available: From 4eaa8d11e611199a45c5dc6b90218b49c48783eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 8 Jun 2022 11:39:46 -0400 Subject: [PATCH 29/87] doc: Update for new myst_parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit da11c624279b9c45b68ee0fdd5045080a9f65a70) Signed-off-by: Simon Deziel --- doc/doc-cheat-sheet.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/doc-cheat-sheet.md b/doc/doc-cheat-sheet.md index aa0d9f6f02c8..9b3c40d5a706 100644 --- a/doc/doc-cheat-sheet.md +++ b/doc/doc-cheat-sheet.md @@ -1,8 +1,9 @@ --- orphan: true -substitutions: - reuse_key: "This is **included** text." - advanced_reuse_key: "This is a substitution that includes a code block: +myst: + substitutions: + reuse_key: "This is **included** text." + advanced_reuse_key: "This is a substitution that includes a code block: ``` code block ```" @@ -480,9 +481,10 @@ Substitutions can be defined in the following locations: ```` --- - substitutions: - reuse_key: "This is **included** text." - advanced_reuse_key: "This is a substitution that includes a code block: + myst: + substitutions: + reuse_key: "This is **included** text." + advanced_reuse_key: "This is a substitution that includes a code block: ``` code block ```" From 8856638b1bbf6ad56cd7586dc8cca51a704ba401 Mon Sep 17 00:00:00 2001 From: Ruth Fuchss Date: Thu, 15 Jun 2023 18:01:36 +0200 Subject: [PATCH 30/87] doc: move .sphinx directory and conf.py file Move the Sphinx configuration files to a more standard location. Signed-off-by: Ruth Fuchss (cherry picked from commit ef0923eb72db751b01c5e5b6a3dd4d69b9e94290) Signed-off-by: Simon Deziel --- .github/workflows/sphinx.yml | 2 +- .gitignore | 11 +- Makefile | 17 +-- {.sphinx => doc/.sphinx}/_extra/rest-api.yaml | 0 {.sphinx => doc/.sphinx}/_static/custom.css | 0 .../.sphinx}/_static/header-nav.js | 0 .../.sphinx}/_static/swagger-override.css | 0 doc/.sphinx/_static/version-switcher.js | 126 ++++++++++++++++++ .../.sphinx}/_templates/footer.html | 0 .../.sphinx}/_templates/header.html | 0 {.sphinx => doc/.sphinx}/_templates/page.html | 0 .../_templates/sidebar/variant-selector.html | 4 + {.sphinx => doc/.sphinx}/requirements.txt | 0 {.sphinx => doc}/conf.py | 16 +-- doc/index.md | 3 +- 15 files changed, 156 insertions(+), 23 deletions(-) rename {.sphinx => doc/.sphinx}/_extra/rest-api.yaml (100%) rename {.sphinx => doc/.sphinx}/_static/custom.css (100%) rename {.sphinx => doc/.sphinx}/_static/header-nav.js (100%) rename {.sphinx => doc/.sphinx}/_static/swagger-override.css (100%) create mode 100644 doc/.sphinx/_static/version-switcher.js rename {.sphinx => doc/.sphinx}/_templates/footer.html (100%) rename {.sphinx => doc/.sphinx}/_templates/header.html (100%) rename {.sphinx => doc/.sphinx}/_templates/page.html (100%) create mode 100644 doc/.sphinx/_templates/sidebar/variant-selector.html rename {.sphinx => doc/.sphinx}/requirements.txt (100%) rename {.sphinx => doc}/conf.py (91%) diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml index 17fef4346e4a..8f43c981f30d 100644 --- a/.github/workflows/sphinx.yml +++ b/.github/workflows/sphinx.yml @@ -13,7 +13,7 @@ jobs: run: make doc - name: Print warnings - run: if [ -s .sphinx/warnings.txt ]; then cat .sphinx/warnings.txt; exit 1; fi + run: if [ -s doc/.sphinx/warnings.txt ]; then cat doc/.sphinx/warnings.txt; exit 1; fi - name: Upload artifacts if: always() diff --git a/.gitignore b/.gitignore index 75dd3db51d3a..dbbc8d3b90d3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,11 +18,12 @@ test/macaroon-identity/macaroon-identity # Sphinx doc/html/ -.sphinx/deps/ -.sphinx/themes/ -.sphinx/venv/ -.sphinx/warnings.txt -.sphinx/_static/swagger-ui +doc/.sphinx/deps/ +doc/.sphinx/themes/ +doc/.sphinx/venv/ +doc/.sphinx/warnings.txt +doc/.sphinx/_static/swagger-ui +doc/.sphinx/_static/download # For Atom ctags .tags diff --git a/Makefile b/Makefile index 28e5899aac92..a98bd869643c 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ HASH := \# TAG_SQLITE3=$(shell printf "$(HASH)include \nvoid main(){dqlite_node_id n = 1;}" | $(CC) ${CGO_CFLAGS} -o /dev/null -xc - >/dev/null 2>&1 && echo "libsqlite3") GOPATH ?= $(shell go env GOPATH) CGO_LDFLAGS_ALLOW ?= (-Wl,-wrap,pthread_create)|(-Wl,-z,now) -SPHINXENV=.sphinx/venv/bin/activate +SPHINXENV=doc/.sphinx/venv/bin/activate ifneq "$(wildcard vendor)" "" RAFT_PATH=$(CURDIR)/vendor/raft @@ -113,19 +113,20 @@ endif .PHONY: doc doc: @echo "Setting up documentation build environment" - python3 -m venv .sphinx/venv - . $(SPHINXENV) ; pip install --upgrade -r .sphinx/requirements.txt - mkdir -p .sphinx/deps/ .sphinx/themes/ - git -C .sphinx/deps/swagger-ui pull || git clone --depth 1 https://github.com/swagger-api/swagger-ui.git .sphinx/deps/swagger-ui - mkdir -p .sphinx/_static/swagger-ui - ln -sf ../../deps/swagger-ui/dist/swagger-ui-bundle.js ../../deps/swagger-ui/dist/swagger-ui-standalone-preset.js ../../deps/swagger-ui/dist/swagger-ui.css .sphinx/_static/swagger-ui/ + python3 -m venv doc/.sphinx/venv + . $(SPHINXENV) ; pip install --upgrade -r doc/.sphinx/requirements.txt + mkdir -p doc/.sphinx/deps/ doc/.sphinx/themes/ + git -C doc/.sphinx/deps/swagger-ui pull || git clone --depth 1 https://github.com/swagger-api/swagger-ui.git doc/.sphinx/deps/swagger-ui + mkdir -p doc/.sphinx/_static/swagger-ui + ln -sf ../../../deps/swagger-ui/dist/swagger-ui-bundle.js ../../../deps/swagger-ui/dist/swagger-ui-standalone-preset.js ../../../deps/swagger-ui/dist/swagger-ui.css doc/.sphinx/_static/swagger-ui/ + wget -N -P doc/.sphinx/_static/download https://linuxcontainers.org/static/img/favicon.ico https://linuxcontainers.org/static/img/containers.png https://linuxcontainers.org/static/img/containers.small.png rm -Rf doc/html make doc-incremental .PHONY: doc-incremental doc-incremental: @echo "Build the documentation" - . $(SPHINXENV) ; sphinx-build -c .sphinx/ -b dirhtml doc/ doc/html/ -w .sphinx/warnings.txt + . $(SPHINXENV) ; sphinx-build -c doc/ -b dirhtml doc/ doc/html/ -w doc/.sphinx/warnings.txt .PHONY: doc-serve doc-serve: diff --git a/.sphinx/_extra/rest-api.yaml b/doc/.sphinx/_extra/rest-api.yaml similarity index 100% rename from .sphinx/_extra/rest-api.yaml rename to doc/.sphinx/_extra/rest-api.yaml diff --git a/.sphinx/_static/custom.css b/doc/.sphinx/_static/custom.css similarity index 100% rename from .sphinx/_static/custom.css rename to doc/.sphinx/_static/custom.css diff --git a/.sphinx/_static/header-nav.js b/doc/.sphinx/_static/header-nav.js similarity index 100% rename from .sphinx/_static/header-nav.js rename to doc/.sphinx/_static/header-nav.js diff --git a/.sphinx/_static/swagger-override.css b/doc/.sphinx/_static/swagger-override.css similarity index 100% rename from .sphinx/_static/swagger-override.css rename to doc/.sphinx/_static/swagger-override.css diff --git a/doc/.sphinx/_static/version-switcher.js b/doc/.sphinx/_static/version-switcher.js new file mode 100644 index 000000000000..4e1c501e8dea --- /dev/null +++ b/doc/.sphinx/_static/version-switcher.js @@ -0,0 +1,126 @@ +/* JavaScript for the _templates/variant-selector.html file, implementing + * the version switcher for the documentation. + * + * The script gets available versions from the versions.json file on the + * master branch (because the master branch contains the current information + * on which versions we want to display). + * It then links to other versions of the documentation - to the same page + * if the page is available or to the index otherwise. + */ + +// Link to the versions.json file on the master branch. +var versionURL = "https://linuxcontainers.org/lxd/docs/master/versions.json"; + +// URL prefix that is common for the different documentation sets. +var URLprefix = "https://linuxcontainers.org/lxd/docs/" + + + +$(document).ready(function() +{ + + // Read the versions.json file and call the listVersions function. + var xhr = new XMLHttpRequest(); + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { + if (xhr.status === 200) { + listVersions(JSON.parse(xhr.responseText)); + } + else { + console.log("URL "+versionURL+" cannot be loaded."); + } + } + }; + xhr.open('GET', versionURL, true); + xhr.send(); + +}); + +// Retrieve the name of the current documentation set (for example, +// 'master' or 'stable-5.0') and the path to the page (for example, +// 'howto/pagename/'). +function getPaths() +{ + var paths = {}; + + var prefix = new URL(URLprefix); + var url = window.location.pathname; + + if (url.startsWith(prefix.pathname)) { + + path = url.substr(prefix.pathname.length).split("/"); + paths['current'] = path.shift(); + if (paths['current'] == "master") { + paths['current'] = "latest"; + }; + paths['page'] = path.join("/"); + } + else { + console.log("Unexpected hosting URL!"); + } + + return paths; + +} + +// Populate the version dropdown. +function listVersions(data) +{ + paths = getPaths(); + + var all_versions = document.getElementById("all-versions"); + var current = document.getElementById("current"); + for( var i = 0; i < data.length; i++ ) + { + var one = data[i]; + if (one.id === paths['current']) { + // Put the current version at the top without link. + current.innerText = one.version+" ⌄"; + } + else { + // Put other versions into the dropdown and link them to the + // suitable URL. + var version = document.createElement("a"); + version.appendChild(document.createTextNode(one.version)); + version.href = findNewURL(paths,one.id); + all_versions.appendChild(version); + } + } +} + +// Check if the same page exists in the other documentation set. +// If yes, return the new link. Otherwise, link to the index page of +// the other documentation set. +function findNewURL(paths,newset) { + + var newURL = URLprefix.concat(newset,"/",paths['page']); + var xhr = new XMLHttpRequest(); + xhr.open('HEAD', newURL, false); + xhr.send(); + + if (xhr.status == "404") { + return URLprefix.concat(newset,"/"); + } else { + return newURL; + } + +} + +// Toggle the version dropdown. +function dropdown() { + document.getElementById("all-versions").classList.toggle("show"); +} + +// Close the dropdown menu if the user clicks outside of it. +window.onclick = function(event) { + if (!event.target.matches('.version_select')) { + var dropdowns = document.getElementsByClassName("available_versions"); + var i; + for (i = 0; i < dropdowns.length; i++) { + var openDropdown = dropdowns[i]; + if (openDropdown.classList.contains('show')) { + openDropdown.classList.remove('show'); + } + } + } +} diff --git a/.sphinx/_templates/footer.html b/doc/.sphinx/_templates/footer.html similarity index 100% rename from .sphinx/_templates/footer.html rename to doc/.sphinx/_templates/footer.html diff --git a/.sphinx/_templates/header.html b/doc/.sphinx/_templates/header.html similarity index 100% rename from .sphinx/_templates/header.html rename to doc/.sphinx/_templates/header.html diff --git a/.sphinx/_templates/page.html b/doc/.sphinx/_templates/page.html similarity index 100% rename from .sphinx/_templates/page.html rename to doc/.sphinx/_templates/page.html diff --git a/doc/.sphinx/_templates/sidebar/variant-selector.html b/doc/.sphinx/_templates/sidebar/variant-selector.html new file mode 100644 index 000000000000..595dccba7649 --- /dev/null +++ b/doc/.sphinx/_templates/sidebar/variant-selector.html @@ -0,0 +1,4 @@ +
    + Doc version: +
    +
    diff --git a/.sphinx/requirements.txt b/doc/.sphinx/requirements.txt similarity index 100% rename from .sphinx/requirements.txt rename to doc/.sphinx/requirements.txt diff --git a/.sphinx/conf.py b/doc/conf.py similarity index 91% rename from .sphinx/conf.py rename to doc/conf.py index 26c856318105..f6dc3da108e2 100644 --- a/.sphinx/conf.py +++ b/doc/conf.py @@ -26,21 +26,21 @@ myst_linkify_fuzzy_links=False myst_heading_anchors = 7 -if os.path.exists("../doc/substitutions.yaml"): - with open("../doc/substitutions.yaml", "r") as fd: +if os.path.exists("./substitutions.yaml"): + with open("./substitutions.yaml", "r") as fd: myst_substitutions = yaml.safe_load(fd.read()) # Setup theme. -templates_path = ["_templates"] +templates_path = [".sphinx/_templates"] html_theme = "furo" html_show_sphinx = False html_last_updated_fmt = "" -html_favicon = "https://linuxcontainers.org/static/img/favicon.ico" -html_static_path = ['_static'] +html_favicon = ".sphinx/_static/download/favicon.ico" +html_static_path = ['.sphinx/_static'] html_css_files = ['custom.css'] -html_js_files = ['header-nav.js'] -html_extra_path = ['_extra'] +html_js_files = ['header-nav.js','version-switcher.js'] +html_extra_path = ['.sphinx/_extra'] html_theme_options = { "sidebar_hide_name": True, @@ -109,7 +109,7 @@ # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This pattern also affects html_static_path and html_extra_path. -exclude_patterns = ['html', 'README.md'] +exclude_patterns = ['html', 'README.md', '.sphinx'] # Setup redirects (https://documatt.gitlab.io/sphinx-reredirects/usage.html) redirects = { diff --git a/doc/index.md b/doc/index.md index 8ab5592a8692..2361ce0aee39 100644 --- a/doc/index.md +++ b/doc/index.md @@ -1,4 +1,5 @@ -[![LXD](../.sphinx/_static/download/containers.png)](https://linuxcontainers.org/lxd) + +[![LXD](.sphinx/_static/download/containers.png)](https://linuxcontainers.org/lxd) % Include content from [../README.md](../README.md) ```{include} ../README.md From d2122fd57510e03d53ec138f2dc010ad24e6a86b Mon Sep 17 00:00:00 2001 From: Ruth Fuchss Date: Mon, 19 Jun 2023 12:51:53 +0200 Subject: [PATCH 31/87] doc: add a .readthedocs.yaml file Signed-off-by: Ruth Fuchss (cherry picked from commit 6af2af63a240651f97f96f002b1538c458dd6856) Signed-off-by: Simon Deziel --- doc/.readthedocs.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 doc/.readthedocs.yaml diff --git a/doc/.readthedocs.yaml b/doc/.readthedocs.yaml new file mode 100644 index 000000000000..15aa6a0bb580 --- /dev/null +++ b/doc/.readthedocs.yaml @@ -0,0 +1,27 @@ +# .readthedocs.yaml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.11" + +# Build documentation in the docs/ directory with Sphinx +sphinx: + builder: dirhtml + configuration: doc/conf.py + fail_on_warning: true + +# If using Sphinx, optionally build your docs in additional formats such as PDF +formats: + - pdf + +# Optionally declare the Python requirements required to build your docs +python: + install: + - requirements: doc/.sphinx/requirements.txt \ No newline at end of file From b3162a8eac1812513b6a30ea23a672d582500d8c Mon Sep 17 00:00:00 2001 From: Ruth Fuchss Date: Mon, 19 Jun 2023 12:54:28 +0200 Subject: [PATCH 32/87] doc: move requirement setup from the Makefile to conf.py RTD doesn't use Makefiles. Signed-off-by: Ruth Fuchss (cherry picked from commit 62657057adae5866cb07c4504fb592c38cac3e26) Signed-off-by: Simon Deziel --- Makefile | 5 ----- doc/.sphinx/requirements.txt | 3 +++ doc/conf.py | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a98bd869643c..a14981a2ef44 100644 --- a/Makefile +++ b/Makefile @@ -115,11 +115,6 @@ doc: @echo "Setting up documentation build environment" python3 -m venv doc/.sphinx/venv . $(SPHINXENV) ; pip install --upgrade -r doc/.sphinx/requirements.txt - mkdir -p doc/.sphinx/deps/ doc/.sphinx/themes/ - git -C doc/.sphinx/deps/swagger-ui pull || git clone --depth 1 https://github.com/swagger-api/swagger-ui.git doc/.sphinx/deps/swagger-ui - mkdir -p doc/.sphinx/_static/swagger-ui - ln -sf ../../../deps/swagger-ui/dist/swagger-ui-bundle.js ../../../deps/swagger-ui/dist/swagger-ui-standalone-preset.js ../../../deps/swagger-ui/dist/swagger-ui.css doc/.sphinx/_static/swagger-ui/ - wget -N -P doc/.sphinx/_static/download https://linuxcontainers.org/static/img/favicon.ico https://linuxcontainers.org/static/img/containers.png https://linuxcontainers.org/static/img/containers.small.png rm -Rf doc/html make doc-incremental diff --git a/doc/.sphinx/requirements.txt b/doc/.sphinx/requirements.txt index af3ea7ad2991..1bf5752e2825 100644 --- a/doc/.sphinx/requirements.txt +++ b/doc/.sphinx/requirements.txt @@ -31,3 +31,6 @@ sphinx-tabs sphinx-reredirects linkify-it-py furo +sphinxext-opengraph>=0.6.1 +gitpython +wget diff --git a/doc/conf.py b/doc/conf.py index f6dc3da108e2..16e1ce8cb671 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -1,6 +1,31 @@ import datetime import os import yaml +from git import Repo +import wget + +# Download and link swagger-ui files +if not os.path.isdir('.sphinx/deps/swagger-ui'): + Repo.clone_from('https://github.com/swagger-api/swagger-ui', '.sphinx/deps/swagger-ui', depth=1) + +os.makedirs('.sphinx/_static/swagger-ui/', exist_ok=True) + +if not os.path.islink('.sphinx/_static/swagger-ui/swagger-ui-bundle.js'): + os.symlink('../../deps/swagger-ui/dist/swagger-ui-bundle.js', '.sphinx/_static/swagger-ui/swagger-ui-bundle.js') +if not os.path.islink('.sphinx/_static/swagger-ui/swagger-ui-standalone-preset.js'): + os.symlink('../../deps/swagger-ui/dist/swagger-ui-standalone-preset.js', '.sphinx/_static/swagger-ui/swagger-ui-standalone-preset.js') +if not os.path.islink('.sphinx/_static/swagger-ui/swagger-ui.css'): + os.symlink('../../deps/swagger-ui/dist/swagger-ui.css', '.sphinx/_static/swagger-ui/swagger-ui.css') + +# Download and link images +os.makedirs('.sphinx/_static/download/', exist_ok=True) + +if not os.path.isfile('.sphinx/_static/download/favicon.ico'): + wget.download("https://linuxcontainers.org/static/img/favicon.ico", ".sphinx/_static/download/favicon.ico") +if not os.path.isfile('.sphinx/_static/download/containers.png'): + wget.download("https://linuxcontainers.org/static/img/containers.png", ".sphinx/_static/download/containers.png") +if not os.path.isfile('doc/.sphinx/_static/download/containers.small.png'): + wget.download("https://linuxcontainers.org/static/img/containers.small.png", ".sphinx/_static/download/containers.small.png") # Project config. project = "LXD" From 0baf35a40e97d661e850661fd2385f9215e70b93 Mon Sep 17 00:00:00 2001 From: Ruth Fuchss Date: Mon, 19 Jun 2023 15:53:19 +0200 Subject: [PATCH 33/87] doc: hide the version selector on RTD Signed-off-by: Ruth Fuchss (cherry picked from commit 85d0c17b5b24887ea729fcdf460fe0ecc4cc79dc) Signed-off-by: Simon Deziel --- .../_templates/sidebar/variant-selector.html | 5 +++++ doc/conf.py | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/doc/.sphinx/_templates/sidebar/variant-selector.html b/doc/.sphinx/_templates/sidebar/variant-selector.html index 595dccba7649..59ae9452fabc 100644 --- a/doc/.sphinx/_templates/sidebar/variant-selector.html +++ b/doc/.sphinx/_templates/sidebar/variant-selector.html @@ -1,4 +1,9 @@ +{% if ON_RTD %} + {% extends "furo/sidebar/variant-selector.html" %} + {{ super() }} +{% else %}
    Doc version:
    +{% endif %} diff --git a/doc/conf.py b/doc/conf.py index 16e1ce8cb671..d638d702bb2b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -129,6 +129,20 @@ "github_filetype": "md" } +# Pass a variable to the template files that informs if we're on +# RTD or not +if ("ON_RTD" in os.environ) and (os.environ["ON_RTD"] == "True"): + html_context["ON_RTD"] = True + +html_sidebars = { + "**": [ + "sidebar/variant-selector.html", + "sidebar/search.html", + "sidebar/scroll-start.html", + "sidebar/navigation.html", + "sidebar/scroll-end.html", + ] +} source_suffix = ".md" # List of patterns, relative to source directory, that match files and From 99d2a447a4bb4c19e8f75382f56bf3877d026cdf Mon Sep 17 00:00:00 2001 From: Ruth Fuchss Date: Tue, 20 Jun 2023 10:14:11 +0200 Subject: [PATCH 34/87] doc: fix styling of version box on RTD Signed-off-by: Ruth Fuchss (cherry picked from commit c24496ac45a139d9fac50e6ea0c659b8148f2d81) Signed-off-by: Simon Deziel --- doc/.sphinx/_static/custom.css | 64 ++++++++++++++++++++++++++++++++++ doc/conf.py | 23 ++++++------ 2 files changed, 77 insertions(+), 10 deletions(-) diff --git a/doc/.sphinx/_static/custom.css b/doc/.sphinx/_static/custom.css index 36e81a5412f5..46faff659dd4 100644 --- a/doc/.sphinx/_static/custom.css +++ b/doc/.sphinx/_static/custom.css @@ -108,3 +108,67 @@ table.min-width-4-8 td.text-left:nth-child(4) { abbr[title] { text-decoration: underline solid #cdcdcd; } + +/** Use the same style for right-details as for left-details **/ +.bottom-of-page .right-details { + font-size: var(--font-size--small); + display: block; +} + +/** Version switcher */ +button.version_select { + color: var(--color-foreground-primary); + background-color: var(--color-toc-background); + padding: 5px 10px; + border: none; +} + +.version_select:hover, .version_select:focus { + background-color: var(--color-sidebar-item-background--hover); +} + +.version_dropdown { + position: relative; + display: inline-block; + text-align: right; + font-size: var(--sidebar-item-font-size); +} + +.available_versions { + display: none; + position: absolute; + right: 0px; + background-color: var(--color-toc-background); + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 11; +} + +.available_versions a { + color: var(--color-foreground-primary); + padding: 12px 16px; + text-decoration: none; + display: block; +} + +.available_versions a:hover {background-color: var(--color-sidebar-item-background--current)} + +.show {display:block;} + +/** Fix the styling of the version box for readthedocs **/ + +#furo-readthedocs-versions .rst-versions, #furo-readthedocs-versions .rst-current-version, #furo-readthedocs-versions:focus-within .rst-current-version, #furo-readthedocs-versions:hover .rst-current-version { + background: var(--color-sidebar-item-background--hover); +} + +.rst-versions .rst-other-versions dd a { + color: var(--color-link); +} + +#furo-readthedocs-versions:focus-within .rst-current-version .fa-book, #furo-readthedocs-versions:hover .rst-current-version .fa-book, .rst-versions .rst-other-versions { + color: var(--color-sidebar-link-text); +} + +.rst-versions .rst-current-version { + color: var(--color-version-popup); + font-weight: bolder; +} diff --git a/doc/conf.py b/doc/conf.py index d638d702bb2b..639f4ae3a4b4 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -96,6 +96,7 @@ "color-highlighted-background": "#EbEbEb", "color-link-underline": "var(--color-background-primary)", "color-link-underline--hover": "var(--color-background-primary)", + "color-version-popup": "#772953" }, "dark_css_variables": { "color-foreground-secondary": "var(--color-foreground-primary)", @@ -119,6 +120,7 @@ "color-highlighted-background": "#666", "color-link-underline": "var(--color-background-primary)", "color-link-underline--hover": "var(--color-background-primary)", + "color-version-popup": "#F29879" }, } @@ -133,16 +135,17 @@ # RTD or not if ("ON_RTD" in os.environ) and (os.environ["ON_RTD"] == "True"): html_context["ON_RTD"] = True - -html_sidebars = { - "**": [ - "sidebar/variant-selector.html", - "sidebar/search.html", - "sidebar/scroll-start.html", - "sidebar/navigation.html", - "sidebar/scroll-end.html", - ] -} +else: + # only change the sidebar when we're not on RTD + html_sidebars = { + "**": [ + "sidebar/variant-selector.html", + "sidebar/search.html", + "sidebar/scroll-start.html", + "sidebar/navigation.html", + "sidebar/scroll-end.html", + ] + } source_suffix = ".md" # List of patterns, relative to source directory, that match files and From 3fbe25607d1b460380a01b942e465bad554d1c78 Mon Sep 17 00:00:00 2001 From: Ruth Fuchss Date: Tue, 4 Jul 2023 18:02:09 +0200 Subject: [PATCH 35/87] doc: add a 404 page Signed-off-by: Ruth Fuchss (cherry picked from commit befbe8a608321e070bf35220013fff05b28a167a) Signed-off-by: Simon Deziel --- doc/.sphinx/requirements.txt | 1 + doc/404.md | 13 +++++++++++++ doc/conf.py | 6 +++++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 doc/404.md diff --git a/doc/.sphinx/requirements.txt b/doc/.sphinx/requirements.txt index 1bf5752e2825..1580db4993e7 100644 --- a/doc/.sphinx/requirements.txt +++ b/doc/.sphinx/requirements.txt @@ -34,3 +34,4 @@ furo sphinxext-opengraph>=0.6.1 gitpython wget +sphinx-notfound-page diff --git a/doc/404.md b/doc/404.md new file mode 100644 index 000000000000..8f6841fda03b --- /dev/null +++ b/doc/404.md @@ -0,0 +1,13 @@ +--- +orphan: true +nosearch: true +--- + +# Page not found + +Sorry, but the documentation page that you are looking for was not found. + +Documentation changes over time, and pages are moved around. +We try to redirect you to the updated content where possible, but unfortunately, that didn't work this time (maybe because the content you were looking for does not exist in this version of the documentation). + +You can try to use the navigation to locate the content you're looking for, or search for a similar page. diff --git a/doc/conf.py b/doc/conf.py index 639f4ae3a4b4..5774e208a3bf 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -39,7 +39,9 @@ extensions = [ "myst_parser", "sphinx_tabs.tabs", - "sphinx_reredirects" + "sphinx_reredirects", + "sphinxext.opengraph", + "notfound.extension" ] myst_enable_extensions = [ @@ -55,6 +57,8 @@ with open("./substitutions.yaml", "r") as fd: myst_substitutions = yaml.safe_load(fd.read()) + +notfound_urls_prefix = "/lxd/en/latest/" # Setup theme. templates_path = [".sphinx/_templates"] From 32d3da1d4849e170efd80fefee9814ee503972ae Mon Sep 17 00:00:00 2001 From: Ruth Fuchss Date: Tue, 4 Jul 2023 09:32:45 +0200 Subject: [PATCH 36/87] doc: update header Signed-off-by: Ruth Fuchss (cherry picked from commit 7362c2bbc0619615401394db55134e454d06e27e) Signed-off-by: Simon Deziel --- .github/ISSUE_TEMPLATE.md | 4 +- .github/SUPPORT.md | 2 +- CONTRIBUTING.md | 2 +- README.md | 37 +-- doc/.sphinx/_static/version-switcher.js | 126 ---------- doc/.sphinx/_templates/header.html | 226 +++++++++++------- .../_templates/sidebar/variant-selector.html | 9 - doc/README.md | 6 +- doc/conf.py | 38 +-- doc/doc-cheat-sheet.md | 24 +- doc/getting_started.md | 1 + doc/index.md | 1 - doc/rest-api.md | 4 +- 13 files changed, 196 insertions(+), 284 deletions(-) delete mode 100644 doc/.sphinx/_static/version-switcher.js delete mode 100644 doc/.sphinx/_templates/sidebar/variant-selector.html diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index c204d363bd1f..1b15c6299637 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,7 @@ diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md index 1ef2114aa5c5..754e578b7d49 100644 --- a/.github/SUPPORT.md +++ b/.github/SUPPORT.md @@ -1,2 +1,2 @@ The LXD team uses GitHub for issue and feature tracking, not for user support. -For information on how to get support, see [Support](https://linuxcontainers.org/lxd/docs/master/support/). +For information on how to get support, see [Support](https://documentation.ubuntu.com/lxd/en/stable-4.0/support/). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c797fb671465..76d29945910e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -104,4 +104,4 @@ When contributing, you must adhere to the Code of Conduct, which is available at ## More information -For more information, see [Contributing](doc/contributing.md) in the documentation. +For more information, see [Contributing](https://documentation.ubuntu.com/lxd/en/stable-4.0/contributing/) in the documentation. diff --git a/README.md b/README.md index b1444212ae23..cec1cead648d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -[![LXD](https://linuxcontainers.org/static/img/containers.png)](https://linuxcontainers.org/lxd) # LXD @@ -8,15 +7,19 @@ It offers a unified user experience around full Linux systems running inside con It's image based with pre-made images available for a [wide number of Linux distributions](https://images.lxd.canonical.com) and is built around a very powerful, yet pretty simple, REST API. -To get a better idea of what LXD is and what it does, you can [try it online](https://linuxcontainers.org/lxd/try-it/)! -Then if you want to run it locally, take a look at our [getting started guide](https://linuxcontainers.org/lxd/getting-started-cli/). -- Release announcements: https://linuxcontainers.org/lxd/news/ -- Release tarballs: https://linuxcontainers.org/lxd/downloads/ -- Documentation: https://linuxcontainers.org/lxd/docs/stable-4.0/ +## Get started + +See [Getting started](https://documentation.ubuntu.com/lxd/en/stable-4.0/getting_started/) in the LXD documentation for installation instructions and first steps. + +- Release announcements: [`https://discourse.ubuntu.com/c/lxd/news/`](https://discourse.ubuntu.com/c/lxd/news/) +- Release tarballs: [`https://github.com/canonical/lxd/releases/`](https://github.com/canonical/lxd/releases/) +- Documentation: [`https://documentation.ubuntu.com/lxd/en/stable-4.0/`](https://documentation.ubuntu.com/lxd/en/stable-4.0/) + + ## Status Type | Service | Status --- | --- | --- @@ -38,10 +41,8 @@ Linux | [Snap](https://snapcraft.io/lxd) | snap i Windows | [Chocolatey](https://chocolatey.org/packages/lxc) | choco install lxc MacOS | [Homebrew](https://formulae.brew.sh/formula/lxc) | brew install lxc -More instructions on installing LXD for a wide variety of Linux distributions and operating systems [can be found on our website](https://linuxcontainers.org/lxd/getting-started-cli/). - -To install LXD from source, see [Installing LXD](doc/installing.md) in the documentation. +For more instructions on installing LXD for a wide variety of Linux distributions and operating systems, and to install LXD from source, see [How to install LXD](https://documentation.ubuntu.com/lxd/en/stable-4.0/installing/) in the documentation. ## Security @@ -56,7 +57,7 @@ Consider the following aspects to ensure that your LXD installation is secure: - Configure your network interfaces to be secure. -See [Security](doc/security.md) for detailed information. +See [Security](https://documentation.ubuntu.com/lxd/en/stable-4.0/security/) for detailed information. **IMPORTANT:** @@ -72,26 +73,26 @@ Therefore, you should only give such access to users who you'd trust with root a The following channels are available for you to interact with the LXD community. ### Bug reports -You can file bug reports and feature requests at: https://github.com/canonical/lxd/issues/new + +You can file bug reports and feature requests at: [`https://github.com/canonical/lxd/issues/new`](https://github.com/canonical/lxd/issues/new) ### Forum -A discussion forum is available at: https://discuss.linuxcontainers.org -### Mailing lists -We use the LXC mailing lists for developer and user discussions. You can -find and subscribe to those at: https://lists.linuxcontainers.org +A discussion forum is available at: [`https://discourse.ubuntu.com/c/lxd/`](https://discourse.ubuntu.com/c/lxd/) ### IRC -If you prefer live discussions, you can find us in [#lxc](https://kiwiirc.com/client/irc.libera.chat/#lxc) on irc.libera.chat. See [Getting started with IRC](https://discuss.linuxcontainers.org/t/getting-started-with-irc/11920) if needed. + +If you prefer live discussions, you can find us in [`#lxd`](https://web.libera.chat/#lxd) on `irc.libera.chat`. See [Getting started with IRC](https://discuss.linuxcontainers.org/t/getting-started-with-irc/11920) if needed. ### Commercial support Commercial support for LXD can be obtained through [Canonical Ltd](https://www.canonical.com). ## Documentation -The official documentation is available at: https://linuxcontainers.org/lxd/docs/master/ -You can find additional resources on the [website](https://linuxcontainers.org/lxd/articles), on [YouTube](https://www.youtube.com/channel/UCuP6xPt0WTeZu32CkQPpbvA) and in the [Tutorials section](https://discuss.linuxcontainers.org/c/tutorials/) in the forum. +The official documentation is available at: [`https://documentation.ubuntu.com/lxd/en/stable-4.0/`](https://documentation.ubuntu.com/lxd/en/stable-4.0/) + +You can find additional resources on the [website](https://ubuntu.com/lxd), on [YouTube](https://www.youtube.com/channel/UCuP6xPt0WTeZu32CkQPpbvA) and in the [Tutorials section](https://discourse.ubuntu.com/c/lxd/tutorials/) in the forum. diff --git a/doc/.sphinx/_static/version-switcher.js b/doc/.sphinx/_static/version-switcher.js deleted file mode 100644 index 4e1c501e8dea..000000000000 --- a/doc/.sphinx/_static/version-switcher.js +++ /dev/null @@ -1,126 +0,0 @@ -/* JavaScript for the _templates/variant-selector.html file, implementing - * the version switcher for the documentation. - * - * The script gets available versions from the versions.json file on the - * master branch (because the master branch contains the current information - * on which versions we want to display). - * It then links to other versions of the documentation - to the same page - * if the page is available or to the index otherwise. - */ - -// Link to the versions.json file on the master branch. -var versionURL = "https://linuxcontainers.org/lxd/docs/master/versions.json"; - -// URL prefix that is common for the different documentation sets. -var URLprefix = "https://linuxcontainers.org/lxd/docs/" - - - -$(document).ready(function() -{ - - // Read the versions.json file and call the listVersions function. - var xhr = new XMLHttpRequest(); - xhr.onreadystatechange = function () { - if (xhr.readyState === 4) { - if (xhr.status === 200) { - listVersions(JSON.parse(xhr.responseText)); - } - else { - console.log("URL "+versionURL+" cannot be loaded."); - } - } - }; - xhr.open('GET', versionURL, true); - xhr.send(); - -}); - -// Retrieve the name of the current documentation set (for example, -// 'master' or 'stable-5.0') and the path to the page (for example, -// 'howto/pagename/'). -function getPaths() -{ - var paths = {}; - - var prefix = new URL(URLprefix); - var url = window.location.pathname; - - if (url.startsWith(prefix.pathname)) { - - path = url.substr(prefix.pathname.length).split("/"); - paths['current'] = path.shift(); - if (paths['current'] == "master") { - paths['current'] = "latest"; - }; - paths['page'] = path.join("/"); - } - else { - console.log("Unexpected hosting URL!"); - } - - return paths; - -} - -// Populate the version dropdown. -function listVersions(data) -{ - paths = getPaths(); - - var all_versions = document.getElementById("all-versions"); - var current = document.getElementById("current"); - for( var i = 0; i < data.length; i++ ) - { - var one = data[i]; - if (one.id === paths['current']) { - // Put the current version at the top without link. - current.innerText = one.version+" ⌄"; - } - else { - // Put other versions into the dropdown and link them to the - // suitable URL. - var version = document.createElement("a"); - version.appendChild(document.createTextNode(one.version)); - version.href = findNewURL(paths,one.id); - all_versions.appendChild(version); - } - } -} - -// Check if the same page exists in the other documentation set. -// If yes, return the new link. Otherwise, link to the index page of -// the other documentation set. -function findNewURL(paths,newset) { - - var newURL = URLprefix.concat(newset,"/",paths['page']); - var xhr = new XMLHttpRequest(); - xhr.open('HEAD', newURL, false); - xhr.send(); - - if (xhr.status == "404") { - return URLprefix.concat(newset,"/"); - } else { - return newURL; - } - -} - -// Toggle the version dropdown. -function dropdown() { - document.getElementById("all-versions").classList.toggle("show"); -} - -// Close the dropdown menu if the user clicks outside of it. -window.onclick = function(event) { - if (!event.target.matches('.version_select')) { - var dropdowns = document.getElementsByClassName("available_versions"); - var i; - for (i = 0; i < dropdowns.length; i++) { - var openDropdown = dropdowns[i]; - if (openDropdown.classList.contains('show')) { - openDropdown.classList.remove('show'); - } - } - } -} diff --git a/doc/.sphinx/_templates/header.html b/doc/.sphinx/_templates/header.html index 50f3aca7c953..b8d17a5efc03 100644 --- a/doc/.sphinx/_templates/header.html +++ b/doc/.sphinx/_templates/header.html @@ -1,71 +1,151 @@ -