many: abbreviated forms of disconnect #2066

zyga · 2016-10-03T17:46:30Z

This picks up #2046

WIP

This patch adds two helpers so that it is easy to create a PlugRef from Plug and a SlotRef from Slot. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

This patch adds a structure representing a single connection. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

…nect Disconnect supports abbreviated forms where one can disconnect, for example, all the connections affecting a given snap. Since interface manager needs to setup security of all the affected snaps and to forget the persistent state of all the affected connections this information is now provided directly by the Disconnect operation. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

This patch adds support for abbreviated disconnect operations that match the suggestions printed by "$ snap disconnect --help". This also fixes a bug where snapd would crash if any of those abbreviated forms were to be used. Fixes: https://bugs.launchpad.net/snappy/+bug/1571497 Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

…isconnect-short-form.

…ort-form

This patch adds a new pair of methods, ResolveDisconnectAll and DisconnectAll that respectively look up a list of connections to sever and disconect a list of connections. DisconnectAll returns a list of names of snaps that were affected by the operation. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

…ort-form

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

niemeyer · 2016-10-03T19:33:45Z

interfaces/repo.go

-func (r *Repository) disconnectEverythingFromSnap(slotSnapName string) error {
-	if _, ok := r.slots[slotSnapName]; !ok {
-		return fmt.Errorf("cannot disconnect plug from snap %q, no such snap", slotSnapName)
+// ResolveDisconnectAll finds all of the connections that would be disconnected by DisconnectAll()


That sounds strange. It's this function that defines what DisconnectAll should disconnect, not the other way around. Suggestion for rename and documentation:

// Connected returns references for all connections that are currently // established with the provided plug or slot. // DisconnectAll disconnects all provided connection references.

Updated comment. Connected might be good enough, actually. This is much less magical than ResolveConnect, as there isn't much "resolving" going on.

niemeyer · 2016-10-03T19:38:21Z

interfaces/repo.go

-		for plug := range r.slotPlugs[slot] {
+	var conns []ConnRef
+	if plugOrSlotName == "" {
+		// "wildcard" mode, affect all the plugs or slots in this snap


Do we have any real use cases for this today? We don't want this in the CLI, so if there are no other use cases we should probably just error for now.

It doesn't seem that we do. I've simplified the code and removed this case.

Removed and simplified

niemeyer · 2016-10-03T19:40:51Z

interfaces/repo.go

+	return conns, nil
+}
+
+// DisconnectAll disconnects all of the given connections, returning the list of affected snap names.


Why are we returning a list of snap names? We asked the repository itself to resolve the list of affected connections for us, so we already have it at hand are actually handing it in. Feels strange to get this list out from this function.

You are right, we don't have to get this back from the function. I was just transcribing things mechanically. I'll get rid of it and move the relevant logic to ifacestate where we actually need it.

Also simplified

…ort-form

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

This patch changes the interface manager to use the new APIs offered by interfaces.Repository for disconnecting. In particular we no longer obtain snap.Info of the affected snaps from the repository (which can contain stale data). Instead we use the snapstate to fetch the current info). In addition of the fully-spelled-out "disconnect snap:plug snap:slot" we now correctly support "disconnect snap:plug" or "disconnect snap:slot". In those two new forms the snap name can be empty (it then defaults to the core snap). This is thanks to the use of the new DisconnectAll method. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

stolowski · 2016-10-04T12:58:00Z

Please update task.yaml following this change from John: https://github.com/chipaca/snappy/blob/7e5c62e78c2888d766b99673c6b4858f907246d7/tests/main/snap-connect/task.yaml

stolowski

Looks good overall. One minor comment below about the strictness of snap/plug/snap/slot argument checking.

stolowski · 2016-10-04T15:51:30Z

overlord/ifacestate/handlers.go

+			return err
+		}
+		affectedConns = []interfaces.ConnRef{{*plugRef, *slotRef}}
+	} else if plugRef.Name != "" {


Should we try to explicitly list all the valid cases in the if/else clauses here? In this case for example user could provide plug name and slot snap name, hoping that this is going to narrow the effect of disconnect down, but in fact I think it would be silently ignored?

This would result in an error from repo but I can easily make the test more obvious. I think you are also right since we are multiplexing to one of two functions depending on argument layout.

Done, have a look please.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

stolowski · 2016-10-04T16:47:14Z

LGTM. +1

niemeyer

Merging, but would be good to sort a few trivials later:

niemeyer · 2016-10-04T19:31:13Z

cmd/snap/cmd_disconnect.go

-
-Disconnects all plugs from the provided snap.
+Disconnects everything from the provided plug or slot.
+The snap name may be omitted for the OS snap.


s/OS snap/core snap/

niemeyer · 2016-10-04T19:31:20Z

cmd/snap/cmd_disconnect_test.go

-
-Disconnects all plugs from the provided snap.
+Disconnects everything from the provided plug or slot.
+The snap name may be omitted for the OS snap.


s/OS snap/core snap/

niemeyer · 2016-10-04T19:32:07Z

interfaces/repo.go

+		case r.slots["ubuntu-core"] != nil:
+			snapName = "ubuntu-core"
+		default:
+			return nil, fmt.Errorf("cannot resolve disconnect, snap name is empty")


s/cannot resolve disconnect, // (not a disconnection in this context)

niemeyer · 2016-10-04T19:32:33Z

interfaces/repo.go

+	}
+	var conns []ConnRef
+	if plugOrSlotName == "" {
+		return nil, fmt.Errorf("cannot resolve disconnect, plug or slot name is empty")


s/cannot resolve disconnect, //

Imported using git-ubuntu import. Changelog parent: d92891f New changelog entries: * New upstream release, LP: #1637215: - release: os-release on core has changed - tests: /dev/ptmx does not work on powerpc, skip here - docs: moved to github.com/snapcore/snapd/wiki (snapcore#2258) - debian: golang is not installable on powerpc, use golang-any * New upstream release, LP: #1637215: - overlord/ifacestate: add unit tests for undo of setup-snap- security (snapcore#2243) - daemon,overlord,snap,tests: download to .partial in final dir (snapcore#2237) - overlord/state: marshaling tests for lanes (snapcore#2245) - overlord/state: introduce state lanes (snapcore#2241) - overlord/snapstate: fix revert+refresh (snapcore#2224) - interfaces/sytemd: enable/disable generated service units (snapcore#2229) - many: fix incorrect security files generation on undo - overlord/snapstate: add dynamic snapdX.Y assumes (snapcore#2227) - interfaces: network-manager: give slot full read-write access to /run/NetworkManager - docs: update the name of the command for the cross-build - overlord/snapstate: fix missing argument to Noticef - snapstate: ensure gadget/core/kernel can not be disabled (snapcore#2218) - asserts: limit to 1y only if len(models) == 0 (snapcore#2219) - debian: only install share/locale if available (missing on powerpc) - overlrod/snapstate: fix revert followed by refresh to old-current (snapcore#2214) - interfaces/builtin: network-manager and bluez can change hostname (snapcore#2204) - snap: switch the auto-import dir to /run/snapd/auto-import - docs: less details about cloud.cfg as requested in trello (snapcore#2206) - spread.yaml: Ensure ubuntu user has passwordless sudo for autopkgtests (snapcore#2201) - interfaces/builtin: add dcdbas-control interface - boot: do not set boot to try mode if the revision is unchanged - interfaces: add shutdown interface (snapcore#2162) - interfaces: add system-power-control interface - many: use the new systemd backend for configuring GPIOs - overlord/ifacestate: setup security for slots before plugs - snap: spool assertion candidates if snapd is not up yet - store,daemon,overlord: download things to a partials dir - asserts,daemon: implement system-user-authority header/concept - interfaces/builtin: home base declaration rule using on-classic for its policy - interfaces/builtin: finish decl based checks - asserts: bump snap-declaration to allow signing with new-style plugs and slots - overlord: checks for kernel installation/refresh based on model assertion and previous kernel - tests/lib/fakestore: fix logic to distinguish assertion not found errors - client: add a few explicit error types (around the request cycle) - tests/lib/fakestore/cmd/fakestore: make it log, and fix a typo - overlord/snapstate: two bugs for one - snappy: disable auto-import of assertions on classic (snapcore#2122) - overlord/snapstate: move trash cleanup to a cleanup handler (snapcore#2173) - daemon: make create-user --known fail on classic without --force- managed (snapcore#2123) - asserts,interfaces/policy: implement on-classic plug/slot constraints - overlord: check that the first installed gadget matches the model assertion - tests: use the snapd-control-consumer snap from the store - cmd/snap: make snap run not talk to snapd for finding the revision - snap/squashfs: try to hard link instead of copying. Also, switch to osutil.CopyFile for cp invocation. - store: send supported max-format when retrieving assertions - snapstate, devicestate: do not remove seed - boot,image,overlord,partition: read/write boot variables in single operation - tests: reenable ubuntu-core tests on qemu - asserts,interfaces/policy: allow OR-ing of subrule constraints in plug/slot rules - many: move from flags as ints to flags as structs-of-bools (snapcore#2156) - many: add supports for keeping and finding assertions with different format iterations - snap: stop using ubuntu-core-launcher, use snap-confine - many: introduce an assertion format iteration concept, refuse to add unsupported assertion - interfaces: tweak wording and comment - spread.yaml: dump apparmor denials on spread failure - tests: unflake ubuntu-core-reboot (snapcore#2150) - cmd/snap: tweak unknown command error message (snapcore#2139) - client,daemon,cmd: add payment-declined error kind (snapcore#2107) - cmd/snap: update remove command help (snapcore#2145) - many: removed frameworks target and fixed service files (snapcore#2138) - asserts,snap: validate attributes to a JSON-compatible type subset (snapcore#2140) - asserts: remove unused serial-proof type - tests: skip auto-import tests on systems without test keys (snapcore#2142) - overlord/devicestate: don't spam the debug log on classic (snapcore#2141) - cmd/snap: simplify auto-import mountinfo parsing (snapcore#2135) - tests: run ubuntu-core upgrades on isolated machine (snapcore#2137) - overlord/devicestate: recover seeding from old external approach (snapcore#2134) - overlord: merge overlord/boot pkg into overlord/devicestate (snapcore#2118) - daemon: add postCreateUserSuite test suite (snapcore#2124) - tests: abort tests if an update process is scheduled (snapcore#2119) - snapstate: avoid reboots if nothing in the boot setup has changed (snapcore#2117) - cmd/snap: do not auto-import from loop or non-dev devices (snapcore#2121) - tests: add spread test for `snap auto-import` (snapcore#2126) - tests: add test for auto-mount assertion import (snapcore#2127) - osutil: add missing unit tests for IsMounted (snapcore#2133) - tests: check for failure creating user on managed ubuntu-core systems (snapcore#2096) - snap: ignore /dev/loop addings from udev (snapcore#2111) - tests: remove snapd.boot-ok reference (snapcore#2109) - tests: enable tests related to the home interface in all-snaps (snapcore#2106) - snapstate: only import defaults from gadget on install (snapcore#2105) - many: move firstboot code into the snapd daemon (snapcore#2033) - store: send correct JSON type of string for expected payment amount (snapcore#2103) - cmd/snap: rename is-managed to managed and tune (snapcore#2102) - interfaces,overlord/ifacestate: initial cleaning up of no arg AutoConnect related bits (snapcore#2090) - client, cmd: prompt for password when buying (snapcore#2086) - snapstate: fix hanging `snap remove` if snap is no longer mounted - image: support gadget specific cloud.conf file (snapcore#2101) - cmd/snap,ctlcmd: fix behavior of snap(ctl) get (snapcore#2093) - store: local users download from the anonymous url (snapcore#2100) - docs/hooks.md: fix typos (snapcore#2099) - many: check installation of slots and plugs against declarations - docs: fix missing "=" in the systemd-active docs - store: do not set store auth for local users (snapcore#2092) - interfaces,overlord/ifacestate: use declaration-based checking for auto-connect (snapcore#2071) - overlord, daemon, snap: support gadget config defaults (snapcore#2082)The main semantic changes are: - tests: fix snap-disconnect tests after core rename (snapcore#2088) - client,daemon,overlord,cmd: add /v2/users and create-user on auto- import (snapcore#2074) - many: abbreviated forms of disconnect (snapcore#2066) - asserts: require lowercase model until insensitive matching is ready (snapcore#2076) - cmd/snap: add version command, same as --version (snapcore#2075) - all: use "core" by default but allow "ubuntu-core" still (snapcore#2070) - overlord/devicestate, docs/hooks.md: nest prepare-device configuration options - daemon: fix login API to return local macaroons (snapcore#2078) - daemon: do not hardcode UID in userLookup (snapcore#2080) - client, cmd: connect fixes (snapcore#2026) - many: preparations for switching most of autoconnect to use the declarationsfor now: - overlord/auth: update CheckMacaroon to verify local snapd macaroons (snapcore#2069) - cmd/snap: trivial auto-import and download tweaks (snapcore#2067) - interfaces: add repo.ResolveConnect that handles name resolution - interfaces/policy: introduce InstallCandidate and its checks - interfaces/policy,overlord: check connection requests against the declarations in ifacestate - many: setup snapd macaroon for local users (snapcore#2051)Next step: do snapd macaroons verification. - interfaces/policy: implement snap-id/publisher-id checks - many: change Connect to take ConnRef instead of strings (snapcore#2060) - snap: auto mount block devices and import assertions (snapcore#2047) - daemon: add `snap create-user --force-managed` support (snapcore#2041) - docs: remove references to removed buying features (snapcore#2057) - interfaces,docs: allow sharing SNAP{,_DATA,_COMMON} via content iface (snapcore#2063) - interfaces: add Plug/Slot/Connection reference helpers (snapcore#2056) - client,daemon,cmd/snap: improve create-user APIs (snapcore#2054) - many: introduce snap refresh --ignore-validation <snap> to override refresh validation (snapcore#2052) - daemon: add support for `snap create-user --known` (snapcore#2040) - interfaces/policy: start of interface policy checking code based on declarations (snapcore#2050) - overlord/configstate: support nested configuration (snapcore#2039) - asserts,interfaces/builtin,overlord/assertstate: introduce base- declaration (snapcore#2037) - interfaces: builtin: Allow writing DHCP lease files to /run/NetworkManager/dhcp (snapcore#2049) - many: remove all traces of the /v2/buy/methods endpoint (snapcore#2045) - tests: add external spread backend (snapcore#1918) - asserts: parse the slot rules in snap-declarations (snapcore#2035) - interfaces: allow read of /etc/ld.so.preload by default for armhf on series 16 (snapcore#2048) - store: change purchase to order and store clean up first pass (snapcore#2043) - daemon, store: switch to new store APIs in snapd (snapcore#2036) - many: add email to UserState (snapcore#2038) - asserts: support parsing the plugs stanza i.e. plug rules in snap- declarations (snapcore#2027) - store: apply deltas if explicitly enabled (snapcore#2031) - tests: fix create-key/snap-sign test isolation (snapcore#2032) - snap/implicit: don't restrict the camera iface to clasic (snapcore#2025) - client, cmd: change buy command to match UX document (snapcore#2011) - coreconfig: nuke it. Also, ignore po/snappy.pot. (snapcore#2030) - store: download deltas if explicitly enabled (snapcore#2017) - many: allow use of the system user assertion with create-user (snapcore#1990) - asserts,overlord,snap: add prepare-device hook for device registration (snapcore#2005) - debian: adjust packaging for trusty/deputy systemd (snapcore#2003) - asserts: introduce AttributeConstraints (snapcore#2015) - interface/builtin: access system bus on screen-inhibit-control - tests: add firewall-control interface test (snapcore#2009) - snapstate: pass errors from ListRefresh in updateInfo (snapcore#2018) - README: add links to IRC, mailing list and social media (snapcore#2022) - docs: add `configure` hook to hooks list (snapcore#2024)LP: #1596629 - cmd/snap,configstate: rename apply-config variables to configure. (snapcore#2023) - store: retry download on 500 (snapcore#2019) - interfaces/builtin: support time and date settings via 'org.freedesktop.timedate1 (snapcore#1832)

zyga and others added 18 commits April 18, 2016 14:15

interfaces: add {Plug,Slot}.Ref

d02b967

This patch adds two helpers so that it is easy to create a PlugRef from Plug and a SlotRef from Slot. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

interfaces: add ConnRef

47a5852

This patch adds a structure representing a single connection. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

Merged branch 'fix-lp1571497' of https://github.com/zyga/snapd into d…

7ddcd7f

…isconnect-short-form.

test fixes: consumer vs producer, snaps are ordering by name

c1805ec

Added disconnectPlugFromOsSlot.

faf4b63

Unit tests for disconnect from core snap.

ec4bcae

Added a spread test fro disconnect (WIP)

b44bb08

Added disconnectPlugOrSlot

ea0ee46

Cleanups, fixes

e9c2293

Fixes for special cases

3e9348a

Fix help

a6f36a8

Removed support for disconnect <snap>

6eefa28

Merge branch 'master' of github.com:snapcore/snapd into disconnect-sh…

612cc30

…ort-form

WIP

f6101eb

Merge branch 'master' of github.com:snapcore/snapd into disconnect-sh…

aae93f1

…ort-form

zyga mentioned this pull request Oct 3, 2016

cmd, disconnect: abbreviated forms of disconnect #2046

Closed

zyga added 2 commits October 3, 2016 20:38

interfaces: tweak error message in ResolveDisconnectAll

853b227

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

interfaces: fix typo

fd17380

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

niemeyer reviewed Oct 3, 2016

View reviewed changes

zyga added 6 commits October 4, 2016 10:45

Merge branch 'master' of github.com:snapcore/snapd into disconnect-sh…

7b9b6de

…ort-form

interfaces: drop unlocked version of ResolveDisconnectAll

fc5233a

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

interfaces: don't return anything from DisconnctAll

5354595

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

interfaces: tweak documentation

d496ce0

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

interfaces: fix typo

dc380e4

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

interfaces: drop wildcard mode on repo.Connected

1c0ff1f

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

zyga added 5 commits October 4, 2016 12:35

interfaces: tweak error test

1a1f189

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

interfaces: simplify and tweak disconnect methods and tests

9bb858f

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

overlord/ifacestate: add more disconnect tests

3f88492

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

daemon: adjust tests after message changes

f653e81

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

stolowski reviewed Oct 4, 2016

View reviewed changes

zyga added 2 commits October 4, 2016 18:07

interfaces: be extra paranoid about disconnect dispatch

3a3bc02

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

overlord/ifacestate: return {Plug,Slot}Ref by value

98e974c

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

niemeyer reviewed Oct 4, 2016

View reviewed changes

niemeyer merged commit b64b2ae into snapcore:master Oct 4, 2016

zyga deleted the disconnect-short-form branch October 4, 2016 22:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

many: abbreviated forms of disconnect #2066

many: abbreviated forms of disconnect #2066

zyga commented Oct 3, 2016

niemeyer Oct 3, 2016 •

edited

niemeyer Oct 3, 2016

zyga Oct 4, 2016

niemeyer Oct 3, 2016

zyga Oct 4, 2016

zyga Oct 4, 2016

niemeyer Oct 3, 2016

zyga Oct 3, 2016

zyga Oct 4, 2016

stolowski commented Oct 4, 2016

stolowski left a comment

stolowski Oct 4, 2016

zyga Oct 4, 2016

stolowski commented Oct 4, 2016

niemeyer left a comment

niemeyer Oct 4, 2016

niemeyer Oct 4, 2016

niemeyer Oct 4, 2016 •

edited

niemeyer Oct 4, 2016

many: abbreviated forms of disconnect #2066

many: abbreviated forms of disconnect #2066

Conversation

zyga commented Oct 3, 2016

niemeyer Oct 3, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stolowski commented Oct 4, 2016

stolowski left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stolowski commented Oct 4, 2016

niemeyer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

niemeyer Oct 4, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

niemeyer Oct 3, 2016 •

edited

niemeyer Oct 4, 2016 •

edited