launchpad-layers

Merge ~cjwatson/launchpad-layers:states-to-flags into launchpad-layers:main

  1. Git
  2. lp:~cjwatson/launchpad-layers
  3. states-to-flags
  4. Merge into main
Proposed by Colin Watson
Status: Merged
Merged at revision: 55af52f5d4f47911b41d404f6e1d19866ceee090
Proposed branch: ~cjwatson/launchpad-layers:states-to-flags
Merge into: launchpad-layers:main
Diff against target: 96 lines (+19/-19)
1 file modified
launchpad-base/reactive/launchpad-base.py (+19/-19)
Reviewer Review Type Date Requested Status
Ines Almeida Approve
Review via email: mp+441455@code.launchpad.net

Commit message

Avoid deprecated reactive functions

Description of the change

`set_state` and `remove_state` were deprecated in charms.reactive 0.5.0; see https://charmsreactive.readthedocs.io/en/latest/changelog.html.

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/launchpad-base/reactive/launchpad-base.py b/launchpad-base/reactive/launchpad-base.py
2index 3063019..adc40d7 100644
3--- a/launchpad-base/reactive/launchpad-base.py
4+++ b/launchpad-base/reactive/launchpad-base.py
5@@ -14,10 +14,10 @@ from charms.launchpad.base import (
6 update_pgpass,
7 )
8 from charms.reactive import (
9+ clear_flag,
10 endpoint_from_flag,
11 hook,
12- remove_state,
13- set_state,
14+ set_flag,
15 when,
16 when_any,
17 when_none,
18@@ -65,12 +65,12 @@ def get_rabbitmq_uris(rabbitmq):
19
20 @when_any("rabbitmq.available", "config.set.rabbitmq_broker_urls")
21 def rabbitmq_available():
22- set_state("launchpad.rabbitmq.available")
23+ set_flag("launchpad.rabbitmq.available")
24
25
26 @when_none("rabbitmq.available", "config.set.rabbitmq_broker_urls")
27 def rabbitmq_unavailable():
28- remove_state("launchpad.rabbitmq.available")
29+ clear_flag("launchpad.rabbitmq.available")
30
31
32 @when("ols.configured", "db.master.available", "launchpad.rabbitmq.available")
33@@ -108,7 +108,7 @@ def configure():
34 configure_rsync(
35 config, "launchpad-base-rsync.conf", "010-launchpad-base.conf"
36 )
37- set_state("launchpad.base.configured")
38+ set_flag("launchpad.base.configured")
39
40
41 @when("launchpad.base.configured")
42@@ -116,8 +116,8 @@ def configure():
43 "ols.configured", "db.master.available", "launchpad.rabbitmq.available"
44 )
45 def deconfigure():
46- remove_state("launchpad.base.configured")
47- remove_state("service.configured")
48+ clear_flag("launchpad.base.configured")
49+ clear_flag("service.configured")
50
51
52 @hook("upgrade-charm")
53@@ -126,31 +126,31 @@ def upgrade_charm():
54 # ols.configured, and service.configured states. Remove
55 # launchpad.base.configured as well so that we have an opportunity to
56 # rewrite base configuration files.
57- remove_state("launchpad.base.configured")
58+ clear_flag("launchpad.base.configured")
59
60
61 @when("config.changed.build_label")
62 def build_label_changed():
63- remove_state("ols.service.installed")
64- remove_state("ols.configured")
65- remove_state("launchpad.base.configured")
66- remove_state("service.configured")
67+ clear_flag("ols.service.installed")
68+ clear_flag("ols.configured")
69+ clear_flag("launchpad.base.configured")
70+ clear_flag("service.configured")
71
72
73 @when("config.changed")
74 def config_changed():
75- remove_state("launchpad.base.configured")
76- remove_state("service.configured")
77+ clear_flag("launchpad.base.configured")
78+ clear_flag("service.configured")
79
80
81 @when("db.database.changed", "launchpad.base.configured")
82 def db_changed():
83- remove_state("launchpad.base.configured")
84- remove_state("service.configured")
85- remove_state("db.database.changed")
86+ clear_flag("launchpad.base.configured")
87+ clear_flag("service.configured")
88+ clear_flag("db.database.changed")
89
90
91 @hook("{requires:rabbitmq}-relation-changed")
92 def rabbitmq_relation_changed(*args):
93- remove_state("launchpad.base.configured")
94- remove_state("service.configured")
95+ clear_flag("launchpad.base.configured")
96+ clear_flag("service.configured")

Subscribers

People subscribed via source and target branches