From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Attila Lendvai <attila@lendvai.name>
Cc: 56799-done@debbugs.gnu.org
Subject: bug#56799: (gnu services configuration) usage of *unspecified* is problematic
Date: Thu, 25 Aug 2022 00:18:36 -0400 [thread overview]
Message-ID: <874jy1ez1f.fsf_-_@gmail.com> (raw)
In-Reply-To: <20220824124042.10959-4-attila@lendvai.name> (Attila Lendvai's message of "Wed, 24 Aug 2022 14:40:41 +0200")
Hi,
Attila Lendvai <attila@lendvai.name> writes:
> * gnu/home/services/ssh.scm (serialize-address-family): Use the public API of
> the maybe infrastructure.
> * gnu/services/file-sharing.scm (serialize-maybe-string): Use maybe-value.
> (serialize-maybe-file-object): Use maybe-value-set?.
> * gnu/services/getmail.scm (getmail-retriever-configuration): Don't use
> internals in unset field declarations.
> (getmail-destination-configuration): Ditto.
> * gnu/services/messaging.scm (raw-content?): Use maybe-value-set?.
> (prosody-configuration): Use %unset-value.
> * gnu/services/telephony.scm (jami-shepherd-services): Use maybe-value-set?.
> (archive-name->username): Use maybe-value-set?.
> * tests/services/configuration.scm ("maybe type, no default"): Use
> %unset-value.
[...]
> --- a/gnu/services/telephony.scm
> +++ b/gnu/services/telephony.scm
> @@ -307,7 +307,7 @@ (define (jami-shepherd-services config)
> (dbus (jami-configuration-dbus config))
> (dbus-daemon (file-append dbus "/bin/dbus-daemon"))
> (accounts (jami-configuration-accounts config))
> - (declarative-mode? (not (eq? 'unset accounts))))
> + (declarative-mode? (maybe-value-set? accounts)))
>
> (with-extensions (list guile-packrat ;used by guile-ac-d-bus
> guile-ac-d-bus
> @@ -649,7 +649,7 @@ (define (archive-name->username archive)
> account-details)
> (let ((username (archive-name->username
> archive)))
> - (when (not (eq? 'unset allowed-contacts))
> + (when (maybe-value-set? allowed-contacts)
> ;; Reject calls from unknown contacts.
> (set-account-details
> '(("DHT.PublicInCalls" . "false")) username)
> @@ -659,7 +659,7 @@ (define (archive-name->username archive)
> ;; Add allowed ones.
> (for-each (cut add-contact <> username)
> allowed-contacts))
> - (when (not (eq? 'unset moderators))
> + (when (maybe-value-set? moderators)
> ;; Disable the 'AllModerators' property.
> (set-all-moderators #f username)
> ;; Remove all moderators.
maybe-value-set? cannot be used there, as the code runs on the target,
not on the host, where (gnu services configuration) is not (and cannot)
be in scope.
I've made the simple change below and pushed:
--8<---------------cut here---------------start------------->8---
modified gnu/services/telephony.scm
@@ -649,7 +649,7 @@ (define (archive-name->username archive)
account-details)
(let ((username (archive-name->username
archive)))
- (when (maybe-value-set? allowed-contacts)
+ (when (not (eq? '#$%unset-value allowed-contacts))
;; Reject calls from unknown contacts.
(set-account-details
'(("DHT.PublicInCalls" . "false")) username)
@@ -659,7 +659,7 @@ (define (archive-name->username archive)
;; Add allowed ones.
(for-each (cut add-contact <> username)
allowed-contacts))
- (when (maybe-value-set? moderators)
+ (when (not (eq? '#$%unset-value moderators))
;; Disable the 'AllModerators' property.
(set-all-moderators #f username)
;; Remove all moderators.
--8<---------------cut here---------------end--------------->8---
I've also adjusted a few 'unset mentions in the doc:
--8<---------------cut here---------------start------------->8---
modified doc/guix.texi
@@ -19846,7 +19846,7 @@ network. A specific port value can be provided by appending the
@code{:PORT} suffix. By default, it uses the Jami bootstrap nodes, but
any host can be specified here. It's also possible to disable
bootstrapping by explicitly setting this field to the
-@code{'unset} value.
+@code{%unset-value} value.
@item @code{port} (default: @code{4222}) (type: maybe-number)
The UDP port to bind to. When left unspecified, an available port is
@@ -31362,7 +31362,7 @@ Each parameter definition is preceded by its type; for example,
@samp{boolean foo} indicates that the @code{foo} parameter should be
specified as a boolean. Types starting with @code{maybe-} denote
parameters that won't show up in TLP config file when their value is
-left unset, or is explicitly set to the @code{'unset} value.
+left unset, or is explicitly set to the @code{%unset-value} value.
@c The following documentation was initially generated by
@c (generate-tlp-documentation) in (gnu services pm). Manually maintained
@@ -38983,8 +38983,7 @@ macro which is a shorthand of this.
Sometimes a field should not be serialized if the user doesn’t specify a
value. To achieve this, you can use the @code{define-maybe} macro to
define a ``maybe type''; if the value of a maybe type is left unset, or
-is set to the @code{'unset} value, then it will not be
-serialized.
+is set to the @code{%unset-value} value, then it will not be serialized.
When defining a ``maybe type'', the corresponding serializer for the
regular type will be used by default. For example, a field of type
--8<---------------cut here---------------end--------------->8---
I've made these changes and pushed, as mentioned in a previous email.
Thank you!
Maxim
next prev parent reply other threads:[~2022-08-25 4:19 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 16:23 bug#56799: (gnu services configuration) usage of *unspecified* is problematic Maxim Cournoyer
2022-07-27 16:43 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2022-07-27 18:27 ` Attila Lendvai
2022-07-28 15:15 ` Maxim Cournoyer
2022-07-27 18:31 ` Maxim Cournoyer
2022-07-27 18:45 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2022-07-27 19:09 ` Maxim Cournoyer
2022-07-27 19:45 ` bug#56799: [PATCH] services: configuration: Step back from *unspecified* Maxim Cournoyer
2022-07-27 19:46 ` bug#56799: (gnu services configuration) usage of *unspecified* is problematic Maxim Cournoyer
2022-07-27 20:20 ` bug#56799: [PATCH v2] gexp: Handle *unspecified* as a gexp input Maxim Cournoyer
2022-07-27 21:43 ` Maxime Devos
2022-07-28 14:58 ` Maxim Cournoyer
2022-07-28 4:41 ` bug#56799: [PATCH v3] " Maxim Cournoyer
2022-08-01 5:08 ` bug#56799: (gnu services configuration) usage of *unspecified* is problematic Maxim Cournoyer
2022-08-01 10:00 ` Maxime Devos
2022-08-01 12:46 ` Maxim Cournoyer
2022-08-01 13:44 ` Ludovic Courtès
2022-08-01 16:55 ` Maxim Cournoyer
2022-07-28 4:55 ` bokr
2022-07-28 10:26 ` Maxime Devos
2022-07-28 15:09 ` Maxim Cournoyer
2022-08-01 13:49 ` Ludovic Courtès
2022-08-01 15:55 ` Maxim Cournoyer
2022-08-02 7:31 ` Ludovic Courtès
2022-08-02 8:45 ` bokr
2022-08-02 15:06 ` Maxim Cournoyer
2022-08-04 12:19 ` Ludovic Courtès
2022-08-07 22:44 ` Ludovic Courtès
2022-08-08 22:27 ` Attila Lendvai
2022-08-08 23:35 ` Attila Lendvai
2022-08-10 2:17 ` Maxim Cournoyer
2022-08-10 3:26 ` Maxim Cournoyer
2022-08-11 10:15 ` Attila Lendvai
2022-08-13 6:31 ` Maxim Cournoyer
2022-08-13 16:47 ` Attila Lendvai
2022-08-14 2:57 ` Maxim Cournoyer
2022-08-16 14:00 ` Attila Lendvai
2022-08-17 13:16 ` Maxim Cournoyer
2022-08-17 16:00 ` paren--- via Bug reports for GNU Guix
2022-08-10 0:43 ` Maxim Cournoyer
2022-08-24 12:40 ` bug#56799: [PATCH 1/5] services: configuration: Add a 'maybe-value-set?' procedure Attila Lendvai
2022-08-24 12:40 ` bug#56799: [PATCH 2/5] services: configuration: Add %unset-value exported variable Attila Lendvai
2022-08-24 12:40 ` bug#56799: [PATCH 3/5] services: configuration: Add maybe-value exported procedure Attila Lendvai
2022-08-24 12:40 ` bug#56799: [PATCH 4/5] services: Use the new maybe/unset API Attila Lendvai
2022-08-25 4:18 ` Maxim Cournoyer [this message]
2022-08-24 12:40 ` bug#56799: [PATCH 5/5] services: configuration: Change the value of the unset marker Attila Lendvai
2022-08-25 4:14 ` bug#56799: (gnu services configuration) usage of *unspecified* is problematic Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874jy1ez1f.fsf_-_@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=56799-done@debbugs.gnu.org \
--cc=attila@lendvai.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).