Merge lp:~hazmat/pyjuju/env-safety-belt into lp:pyjuju

[Kapil Thangavelu]

configuration safety belt for environments.

Per request, an environment with a client side config value of prevent-destroy:
true will not allow itself to be destroyed via juju destroy-environment, and
appropriate message to that effect will instead result on an attempt.

https://codereview.appspot.com/6574059/

[Kapil Thangavelu (hazmat)]

Reviewers: mp+126819_code.launchpad.net,

Message:
Please take a look.

Description:
configuration safety belt for environments.

Per request, an environment with a client side config value of
prevent-destroy:
true will not allow itself to be destroyed via juju destroy-environment,
and
appropriate message to that effect will instead result on an attempt.

https://code.launchpad.net/~hazmat/juju/env-safety-belt/+merge/126819

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6574059/

Affected files:
   A [revision details]
   M juju/control/destroy_environment.py
   M juju/control/tests/test_destroy_environment.py
   M juju/environment/environment.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: juju/control/destroy_environment.py
=== modified file 'juju/control/destroy_environment.py'
--- juju/control/destroy_environment.py 2012-07-13 15:12:02 +0000
+++ juju/control/destroy_environment.py 2012-09-27 21:53:57 +0000
@@ -21,6 +21,12 @@
      environment = get_environment(options)
      provider = environment.get_machine_provider()

+ if environment.prevent_destroy:
+ options.log.warning(
+ "Environment %r configuration prevents destruction" % (
+ environment.name))
+ return
+
      value = raw_input(
          "WARNING: this command will destroy the %r environment
(type: %s).\n"
          "This includes all machines, services, data, and other resources. "

Index: juju/environment/environment.py
=== modified file 'juju/environment/environment.py'
--- juju/environment/environment.py 2012-04-06 18:53:52 +0000
+++ juju/environment/environment.py 2012-09-27 21:53:57 +0000
@@ -56,3 +56,7 @@
      def origin(self):
          """Returns the origin of the code."""
          return self._environment_config.get("juju-origin", "distro")
+
+ @property
+ def prevent_destroy(self):
+ return self._environment_config.get("prevent-destroy", False)

Index: juju/control/tests/test_destroy_environment.py
=== modified file 'juju/control/tests/test_destroy_environment.py'
--- juju/control/tests/test_destroy_environment.py 2012-09-10 03:20:20 +0000
+++ juju/control/tests/test_destroy_environment.py 2012-09-27 21:53:57 +0000
@@ -11,6 +11,26 @@
  class ControlDestroyEnvironmentTest(ControlToolTest):

      @inlineCallbacks
+ def test_prevent_destroy_setting(self):
+ """Environment config can explicitly prevent destruction.
+ """
+ config = {
+ 'environments': {'firstenv': {
+ 'type': 'dummy', 'prevent-destroy': True}}
+ }
+ self.write_config(dump(config))
+ finished = self.setup_cli_reactor()
+ self.setup_exit(0)
+ self.mocker.replay()
+
+ stderr = self.capture_logging()
+ main(['destroy-environment'])
+ yield finished
+ self.assertIn(
+ "Environment 'firstenv' co...

[Clint Byrum (clint-fewbar)]

LGTM, and a nice idea, though it exposes a hole in SCHEMA that we can't specify global options like this.

review: Approve

=== modified file 'juju/control/destroy_environment.py'
--- juju/control/destroy_environment.py	2012-07-13 15:12:02 +0000
+++ juju/control/destroy_environment.py	2012-09-27 22:25:22 +0000
@@ -21,6 +21,12 @@
     environment = get_environment(options)
     provider = environment.get_machine_provider()
 
+    if environment.prevent_destroy:
+        options.log.warning(
+            "Environment %r configuration prevents destruction" % (
+                environment.name))
+        return
+
     value = raw_input(
         "WARNING: this command will destroy the %r environment (type: %s).\n"
         "This includes all machines, services, data, and other resources. "

=== modified file 'juju/control/tests/test_destroy_environment.py'
--- juju/control/tests/test_destroy_environment.py	2012-09-10 03:20:20 +0000
+++ juju/control/tests/test_destroy_environment.py	2012-09-27 22:25:22 +0000
@@ -11,6 +11,26 @@
 class ControlDestroyEnvironmentTest(ControlToolTest):
 
     @inlineCallbacks
+    def test_prevent_destroy_setting(self):
+        """Environment config can explicitly prevent destruction.
+        """
+        config = {
+            'environments': {'firstenv': {
+                'type': 'dummy', 'prevent-destroy': True}}
+            }
+        self.write_config(dump(config))
+        finished = self.setup_cli_reactor()
+        self.setup_exit(0)
+        self.mocker.replay()
+
+        stderr = self.capture_logging()
+        main(['destroy-environment'])
+        yield finished
+        self.assertIn(
+            "Environment 'firstenv' configuration prevents destruction",
+            stderr.getvalue())
+
+    @inlineCallbacks
     def test_destroy_multiple_environments_no_default(self):
         """With multiple environments a default needs to be set or passed.
         """

=== modified file 'juju/environment/environment.py'
--- juju/environment/environment.py	2012-04-06 18:53:52 +0000
+++ juju/environment/environment.py	2012-09-27 22:25:22 +0000
@@ -56,3 +56,7 @@
     def origin(self):
         """Returns the origin of the code."""
         return self._environment_config.get("juju-origin", "distro")
+
+    @property
+    def prevent_destroy(self):
+        return self._environment_config.get("prevent-destroy", False)