Codebase list bundlewrap / 2417bdf
New upstream release Jonathan Carter 5 years ago
13 changed file(s) with 105 addition(s) and 37 deletion(s). Raw diff Collapse all Expand all
+8
-0
CHANGELOG.md less more
0 # 3.5.2
1
2 2018-12-11
3
4 * fixed IO activation/deactivation when using bw as a library
5 * fixed `atomic()` being removed prematurely during metadata processing
6
7
08 # 3.5.1
19
210 2018-07-08
+1
-1
bundlewrap/__init__.py less more
00 # -*- coding: utf-8 -*-
11 from __future__ import unicode_literals
22
3 VERSION = (3, 5, 1)
3 VERSION = (3, 5, 2)
44 VERSION_STRING = ".".join([str(v) for v in VERSION])
+1
-1
bundlewrap/items/kubernetes.py less more
167167 def sdict(self):
168168 result = run_local(self._kubectl + ["get", "-o", "json", self.KIND, self.resource_name])
169169 if result.return_code == 0:
170 full_json_response = json.loads(result.stdout)
170 full_json_response = json.loads(result.stdout.decode('utf-8'))
171171 if full_json_response.get("status", {}).get("phase") == "Terminating":
172172 # this resource is currently being deleted, consider it gone
173173 return None
+21
-16
bundlewrap/lock.py less more
88 from socket import gethostname
99 from time import time
1010
11 from .exceptions import NodeLockedException
11 from .exceptions import NodeLockedException, RemoteException
1212 from .utils import cached_property, tempfile
1313 from .utils.text import (
1414 blue,
1919 parse_duration,
2020 red,
2121 wrap_question,
22 yellow,
2223 )
2324 from .utils.ui import io
2425
2728 HARD_LOCK_FILE = HARD_LOCK_PATH + "/info"
2829 SOFT_LOCK_PATH = "/tmp/bundlewrap.softlock.d"
2930 SOFT_LOCK_FILE = "/tmp/bundlewrap.softlock.d/{id}"
31
32
33 def get_hard_lock_info(node, local_path):
34 try:
35 node.download(HARD_LOCK_FILE, local_path)
36 with open(local_path, 'r') as fp:
37 return json.load(fp)
38 except (RemoteException, ValueError):
39 io.stderr(_(
40 "{x} {node} corrupted hard lock: "
41 "unable to read or parse lock file contents "
42 "(clear it with `bw run {node} 'rm -Rf {path}'`)"
43 ).format(
44 node=bold(node.name),
45 path=HARD_LOCK_PATH,
46 warning=yellow("!"),
47 ))
48 return {}
3049
3150
3251 def identity():
5170 with io.job(_("{node} checking hard lock status").format(node=bold(self.node.name))):
5271 result = self.node.run("mkdir " + quote(HARD_LOCK_PATH), may_fail=True)
5372 if result.return_code != 0:
54 self.node.download(HARD_LOCK_FILE, local_path)
55 with open(local_path, 'r') as f:
56 try:
57 info = json.loads(f.read())
58 except:
59 io.stderr(_(
60 "{warning} corrupted lock on {node}: "
61 "unable to read or parse lock file contents "
62 "(clear it with `bw run {node} 'rm -R {path}'`)"
63 ).format(
64 node=self.node.name,
65 path=HARD_LOCK_FILE,
66 warning=red(_("WARNING")),
67 ))
68 info = {}
73 info = get_hard_lock_info(self.node, local_path)
6974 expired = False
7075 try:
7176 d = info['date']
+12
-3
bundlewrap/metadata.py less more
266266 if isinstance(obj, METADATA_TYPES):
267267 return obj
268268 elif isinstance(obj, dict):
269 new_obj = {}
269 if isinstance(obj, ATOMIC_TYPES[dict]):
270 new_obj = atomic({})
271 else:
272 new_obj = {}
270273 for key, value in obj.items():
271274 if not isinstance(key, METADATA_TYPES):
272275 raise ValueError(_("illegal metadata key type: {}").format(repr(key)))
273276 new_key = copy(key)
274277 new_obj[new_key] = deepcopy_metadata(value)
275278 elif isinstance(obj, (list, tuple)):
276 new_obj = []
279 if isinstance(obj, (ATOMIC_TYPES[list], ATOMIC_TYPES[tuple])):
280 new_obj = atomic([])
281 else:
282 new_obj = []
277283 for member in obj:
278284 new_obj.append(deepcopy_metadata(member))
279285 elif isinstance(obj, set):
280 new_obj = set()
286 if isinstance(obj, ATOMIC_TYPES[set]):
287 new_obj = atomic(set())
288 else:
289 new_obj = set()
281290 for member in obj:
282291 new_obj.add(deepcopy_metadata(member))
283292 else:
+5
-5
bundlewrap/repo.py less more
6666 INITIAL_CONTENT = {
6767 FILENAME_GROUPS: _("""
6868 groups = {
69 #'group1': {
69 #'group-1': {
7070 # 'bundles': (
71 # 'bundle1',
71 # 'bundle-1',
7272 # ),
7373 # 'members': (
74 # 'node1',
74 # 'node-1',
7575 # ),
7676 # 'subgroups': (
77 # 'group2',
77 # 'group-2',
7878 # ),
7979 #},
8080 'all': {
8787
8888 FILENAME_NODES: _("""
8989 nodes = {
90 'node1': {
90 'node-1': {
9191 'hostname': "localhost",
9292 },
9393 }
+9
-8
bundlewrap/utils/ui.py less more
178178 self._spinner = spinner()
179179 self._last_spinner_character = next(self._spinner)
180180 self._last_spinner_update = 0
181 self._signal_handler_thread = Thread(
182 target=self._signal_handler_thread_body,
183 )
184 # daemon mode is required because we need to keep the thread
185 # around until the end of a soft shutdown to wait for a hard
186 # shutdown signal, but don't have a feasible way of stopping
187 # the thread once the soft shutdown has completed
188 self._signal_handler_thread.daemon = True
181 self._signal_handler_thread = None
189182 self._child_pids = []
190183 self._status_line_present = False
191184 self._waiting_for_input = False
200193 getpid(),
201194 ),
202195 ), 'a')
196 self._signal_handler_thread = Thread(
197 target=self._signal_handler_thread_body,
198 )
199 # daemon mode is required because we need to keep the thread
200 # around until the end of a soft shutdown to wait for a hard
201 # shutdown signal, but don't have a feasible way of stopping
202 # the thread once the soft shutdown has completed
203 self._signal_handler_thread.daemon = True
203204 self._signal_handler_thread.start()
204205 signal(SIGINT, sigint_handler)
205206 signal(SIGQUIT, sigquit_handler)
+7
-0
debian/changelog less more
0 bundlewrap (3.5.2-1) unstable; urgency=medium
1
2 * New upstream release
3 * Update standards version to 4.2.1
4
5 -- Jonathan Carter <jcc@debian.org> Sun, 16 Dec 2018 14:24:01 +0200
6
07 bundlewrap (3.5.1-1) unstable; urgency=medium
18
29 * New upstream release
+1
-1
docs/content/guide/secrets.md less more
6363
6464 You can also encrypt entire files:
6565
66 <pre><code class="nohighlight">$ bw debug -c "repo.vault.encrypt_file('/my/secret.file', 'encrypted.file'))"</code></pre>
66 <pre><code class="nohighlight">$ bw debug -c "repo.vault.encrypt_file('/my/secret.file', 'encrypted.file')"</code></pre>
6767
6868 <div class="alert alert-info">Encrypted files are always read and written relative to the <code>data/</code> subdirectory of your repo.</div>
6969
+1
-0
docs/content/index.md less more
2424 <a href="/items/file/#source">data/</a>
2525 <a href="/repo/hooks">hooks/</a>
2626 <a href="/guide/dev_item">items/</a>
27 <a href="/repo/libs">libs/</a>
2728 <a href="/guide/secrets">.secrets.cfg</a>
2829 <a href="/repo/groups.py">groups.py</a>
2930 <a href="/repo/nodes.py">nodes.py</a>
+2
-1
docs/content/repo/nodes.py.md less more
3737 Especially in larger installations, a single nodes.py can become inconvenient to work with. This example reads nodes from a `nodes/` directory.
3838
3939 from glob import glob
40 from os.path import join
4041
4142 nodes = {}
42 for node in glob("nodes/*.py"):
43 for node in glob(join(repo_path, "nodes", "*.py")):
4344 with open(node, 'r') as f:
4445 exec(f.read())
4546
+1
-1
setup.py less more
1616
1717 setup(
1818 name="bundlewrap",
19 version="3.5.1",
19 version="3.5.2",
2020 description="Config management with Python",
2121 long_description=(
2222 "By allowing for easy and low-overhead config management, BundleWrap fills the gap between complex deployments using Chef or Puppet and old school system administration over SSH.\n"
+36
-0
tests/integration/bw_metadata.py less more
192192 assert rcode == 0
193193
194194
195 def test_metadatapy_defaults_atomic(tmpdir):
196 make_repo(
197 tmpdir,
198 bundles={"test": {}},
199 )
200 with open(join(str(tmpdir), "nodes.py"), 'w') as f:
201 f.write(
202 """
203 from bundlewrap.metadata import atomic
204
205 nodes = {
206 "node1": {
207 'bundles': ["test"],
208 'metadata': {"foo": atomic({"bar": "baz"})},
209 },
210 }
211 """)
212 with open(join(str(tmpdir), "bundles", "test", "metadata.py"), 'w') as f:
213 f.write(
214 """@metadata_processor
215 def foo(metadata):
216 return {
217 "foo": {
218 "bar": "frob",
219 "baz": "gobble",
220 },
221 }, DONE, DEFAULTS
222 """)
223 stdout, stderr, rcode = run("bw metadata node1", path=str(tmpdir))
224 assert loads(stdout.decode()) == {
225 "foo": {"bar": "baz"},
226 }
227 assert stderr == b""
228 assert rcode == 0
229
230
195231 def test_metadatapy_update(tmpdir):
196232 make_repo(
197233 tmpdir,