From deb77f31cb254405c1a516fb5f5fd52ce9c13182 Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Tue, 23 Jun 2020 17:58:43 +0100
Subject: [PATCH] ui: Add namespaced versions of templated policies (#8173)

---
 ui-v2/app/components/node-identity/index.hbs  | 15 ++++++++++++++-
 ui-v2/app/components/policy-form/index.hbs    |  2 +-
 .../app/components/policy-selector/index.hbs  |  4 ++--
 .../app/components/service-identity/index.hbs | 19 ++++++++++++++++++-
 .../app/templates/dc/acls/policies/-form.hbs  |  2 +-
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/ui-v2/app/components/node-identity/index.hbs b/ui-v2/app/components/node-identity/index.hbs
index 7ee0bfa2e0..e570640bee 100644
--- a/ui-v2/app/components/node-identity/index.hbs
+++ b/ui-v2/app/components/node-identity/index.hbs
@@ -1,6 +1,19 @@
+{{#if (env "CONSUL_NSPACES_ENABLED")}}
+namespace "default" {
+  node "{{name}}" {
+	  policy = "write"
+  }
+}
+namespace_prefix "" {
+  service_prefix "" {
+	  policy = "read"
+  }
+}
+{{else}}
 node "{{name}}" {
 	policy = "write"
 }
 service_prefix "" {
 	policy = "read"
-}
\ No newline at end of file
+}
+{{/if}}
\ No newline at end of file
diff --git a/ui-v2/app/components/policy-form/index.hbs b/ui-v2/app/components/policy-form/index.hbs
index 01137a6526..6204c5e5b9 100644
--- a/ui-v2/app/components/policy-form/index.hbs
+++ b/ui-v2/app/components/policy-form/index.hbs
@@ -36,7 +36,7 @@
         <span>Rules <a href="{{env 'CONSUL_DOCS_URL'}}/guides/acl.html#rule-specification" rel="help noopener noreferrer" target="_blank">(HCL Format)</a></span>
 {{#if (eq item.template 'service-identity')}}
         <CodeEditor @readonly={{true}} @name={{concat name "[Rules]"}} @syntax="hcl" @oninput={{action "change" (concat name "[Rules]")}}>
-          {{~component 'service-identity' name=item.Name~}}
+          {{~component 'service-identity' nspace=nspace name=item.Name~}}
         </CodeEditor>
 {{else if (eq item.template 'node-identity')}}
         <CodeEditor @readonly={{true}} @name={{concat name "[Rules]"}} @syntax="hcl" @oninput={{action "change" (concat name "[Rules]")}}>
diff --git a/ui-v2/app/components/policy-selector/index.hbs b/ui-v2/app/components/policy-selector/index.hbs
index 38cbea1dfd..270e89f33a 100644
--- a/ui-v2/app/components/policy-selector/index.hbs
+++ b/ui-v2/app/components/policy-selector/index.hbs
@@ -21,7 +21,7 @@
           <h2>New Policy</h2>
         </BlockSlot>
         <BlockSlot @name="body">
-          <PolicyForm @form={{form}} @dc={{dc}} @allowServiceIdentity={{allowServiceIdentity}} />
+          <PolicyForm @form={{form}} @nspace={{nspace}} @dc={{dc}} @allowServiceIdentity={{allowServiceIdentity}} />
         </BlockSlot>
         <BlockSlot @name="actions" as |close|>
           <button type="submit" {{action 'save' item items (queue (action close) (action 'reset'))}} disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}>
@@ -83,7 +83,7 @@
             <span>Rules <a href="{{env 'CONSUL_DOCS_URL'}}/guides/acl.html#rule-specification" rel="help noopener noreferrer" target="_blank">(HCL Format)</a></span>
 {{#if (eq item.template 'service-identity')}}
             <CodeEditor @syntax="hcl" @readonly={{true}}>
-              {{~component 'service-identity' name=item.Name~}}
+              {{~component 'service-identity' nspace=nspace name=item.Name~}}
             </CodeEditor>
 {{else if (eq item.template 'node-identity')}}
             <CodeEditor @syntax="hcl" @readonly={{true}}>
diff --git a/ui-v2/app/components/service-identity/index.hbs b/ui-v2/app/components/service-identity/index.hbs
index 281697d116..597febc1b0 100644
--- a/ui-v2/app/components/service-identity/index.hbs
+++ b/ui-v2/app/components/service-identity/index.hbs
@@ -1,3 +1,19 @@
+{{#if (env "CONSUL_NSPACES_ENABLED")}}
+namespace "{{nspace}}" {
+  service "{{name}}" {
+	  policy = "write"
+  }
+  service "{{name}}-sidecar-proxy" {
+	  policy = "write"
+  }
+  service_prefix "" {
+	  policy = "read"
+  }
+  node_prefix "" {
+	  policy = "read"
+  }
+}
+{{else}}
 service "{{name}}" {
 	policy = "write"
 }
@@ -9,4 +25,5 @@ service_prefix "" {
 }
 node_prefix "" {
 	policy = "read"
-}
\ No newline at end of file
+}
+{{/if}}
\ No newline at end of file
diff --git a/ui-v2/app/templates/dc/acls/policies/-form.hbs b/ui-v2/app/templates/dc/acls/policies/-form.hbs
index 0ab52245d4..e3ec9be954 100644
--- a/ui-v2/app/templates/dc/acls/policies/-form.hbs
+++ b/ui-v2/app/templates/dc/acls/policies/-form.hbs
@@ -1,5 +1,5 @@
 <form>
-  <PolicyForm @form={{form}} @item={{item}}>
+  <PolicyForm @form={{form}} @nspace={{nspace}} @item={{item}}>
     {{!don't show template selection here, i.e. Service Identity}}
     <BlockSlot @name="template" />
   </PolicyForm>