Merge pull request #1168 from deis/499-git-repo

fix(builder): delete the git repo on `apps:destroy`

Author: Matthew Fisher

builder/conf.d/check-repos.toml

@@ -0,0 +1,10 @@
+[template]
+src   = "check-repos"
+dest  = "/home/git/check-repos"
+uid = 0
+gid = 0
+mode  = "0755"
+keys = [
+  "/deis/services",
+]
+reload_cmd = "/home/git/check-repos"

builder/templates/check-repos

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+listcontains() {
+    for word in $1; do
+        [[ $word = $2 ]] && return 0
+    done
+    return 1
+}
+
+cd $(dirname $0) # absolute path
+
+for repo in *.git;
+do
+    reponame="${repo%.*}"
+    if ! listcontains "{{ range $services := .deis_services }}{{ Base $services.Key }} {{ end }}" "$reponame";
+    then
+        rm -rf "$repo"
+    fi
+done

builder/tests/builder_test.go

@@ -49,6 +49,7 @@ func TestBuilder(t *testing.T) {
 		"/deis/database",
 		"/deis/registry",
 		"/deis/domains",
+		"/deis/services",
 	}
 	testID := utils.NewUuid()
 	err := dockercliutils.BuildImage(t, "../", "deis/builder:"+testID)

controller/api/models.py

@@ -632,6 +632,17 @@ def _etcd_purge_user(**kwargs):
         pass
 
 
+def _etcd_create_app(**kwargs):
+    appname = kwargs['instance']
+    if kwargs['created']:
+        _etcd_client.write('/deis/services/{}'.format(appname), None, dir=True)
+
+
+def _etcd_purge_app(**kwargs):
+    appname = kwargs['instance']
+    _etcd_client.delete('/deis/services/{}'.format(appname), dir=True, recursive=True)
+
+
 def _etcd_publish_domains(**kwargs):
     app = kwargs['instance'].app
     app_domains = app.domain_set.all()
@@ -670,3 +681,5 @@ def _save_transition(**kwargs):
     post_delete.connect(_etcd_purge_user, sender=User, dispatch_uid='api.models')
     post_save.connect(_etcd_publish_domains, sender=Domain, dispatch_uid='api.models')
     post_delete.connect(_etcd_publish_domains, sender=Domain, dispatch_uid='api.models')
+    post_save.connect(_etcd_create_app, sender=App, dispatch_uid='api.models')
+    post_delete.connect(_etcd_purge_app, sender=App, dispatch_uid='api.models')

controller/bin/boot

@@ -28,11 +28,17 @@ function etcd_set_default {
   etcdctl --no-sync -C $ETCD mk $ETCD_PATH/$1 $2 >/dev/null 2>&1 || true
 }
 
+function etcd_safe_mkdir {
+  etcdctl --no-sync -C $ETCD mkdir $1 >/dev/null 2>&1 || true
+}
+
 etcd_set_default protocol ${DEIS_PROTOCOL:-http}
 etcd_set_default secretKey ${DEIS_SECRET_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
 etcd_set_default builderKey ${DEIS_BUILDER_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
 etcd_set_default registrationEnabled 1
 etcd_set_default webEnabled 0
+# create path for application metadata
+etcd_safe_mkdir /deis/services
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null; do

docs/managing_deis/builder_settings.rst

@@ -40,6 +40,7 @@ setting                                   description
 /deis/controller/protocol                 protocol of the controller component (set by controller)
 /deis/registry/host                       host of the controller component (set by registry)
 /deis/registry/port                       port of the controller component (set by registry)
+/deis/services/*                          application metadata (set by controller)
 ====================================      ===========================================================
 
 Using a custom builder image