aboutsummaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2018-03-27 23:04:41 +0100
committerChristopher Baines <mail@cbaines.net>2018-04-03 21:58:55 +0100
commit94f9e2a768327479c8b2da99cd57ac717cf1589a (patch)
tree819c093f8fb7c37c6017ede36db4f01854a8bcc8 /app/views
parentfa06e98228d8dd80a46622c9f393bb90e680d254 (diff)
downloadgovuk-mini-environment-admin-94f9e2a768327479c8b2da99cd57ac717cf1589a.tar
govuk-mini-environment-admin-94f9e2a768327479c8b2da99cd57ac717cf1589a.tar.gz
Add domains to backends, and rework build jobs
Add a domain to the libvirt and AWS Terraform backends. Along the way, improve the backend controllers and views, and rework the build jobs, simplifying them in to a single new class GovukGuix::BuildJob, which uses configuration from the respective backend.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/backends/terraform_aws/new.html.erb24
-rw-r--r--app/views/backends/terraform_aws/show.html.erb25
-rw-r--r--app/views/backends/terraform_libvirt/new.html.erb10
-rw-r--r--app/views/backends/terraform_libvirt/show.html.erb13
-rw-r--r--app/views/mini_environments/show.html.erb2
5 files changed, 70 insertions, 4 deletions
diff --git a/app/views/backends/terraform_aws/new.html.erb b/app/views/backends/terraform_aws/new.html.erb
index 0d33fcf..a6f2f6a 100644
--- a/app/views/backends/terraform_aws/new.html.erb
+++ b/app/views/backends/terraform_aws/new.html.erb
@@ -23,6 +23,30 @@
</div>
<div class="form-group form-group-lg">
+ <%= f.label :domain, class: 'col-sm-4 control-label' %>
+ <div class="col-sm-8">
+ <%= f.text_field(
+ :domain,
+ class: 'form-control',
+ placeholder: 'Domain within which to host mini environments'
+ ) %>
+ <span class="help-block">
+ <p>
+ For example, if you entered <samp>example.com</samp> for
+ the backend domain, and then created a mini environment
+ called "Test" using this backend, then the application
+ domain for the mini environment would be
+ <samp>test.example.com</samp>.
+ </p>
+ <p>
+ A Route53 Hosted Zone will be created for this domain,
+ and records added for the mini environments.
+ </p>
+ </span>
+ </div>
+ </div>
+
+ <div class="form-group form-group-lg">
<%= f.label :aws_region, 'AWS Region', class: 'col-sm-4 control-label' %>
<div class="col-sm-8">
<%= f.text_field(
diff --git a/app/views/backends/terraform_aws/show.html.erb b/app/views/backends/terraform_aws/show.html.erb
index 1a8c20c..c061d75 100644
--- a/app/views/backends/terraform_aws/show.html.erb
+++ b/app/views/backends/terraform_aws/show.html.erb
@@ -26,6 +26,31 @@
</div>
<div class="form-group form-group-lg">
+ <%= f.label :domain, class: 'col-sm-4 control-label' %>
+ <div class="col-sm-8">
+ <%= f.text_field(
+ :domain,
+ class: 'form-control',
+ placeholder: 'Domain within which to host mini environments',
+ readonly: true
+ ) %>
+ <span class="help-block">
+ <p>
+ For example, if you entered <samp>example.com</samp> for
+ the backend domain, and then created a mini environment
+ called "Test" using this backend, then the application
+ domain for the mini environment would be
+ <samp>test.example.com</samp>.
+ </p>
+ <p>
+ A Route53 Hosted Zone will be created for this domain,
+ and records added for the mini environments.
+ </p>
+ </span>
+ </div>
+ </div>
+
+ <div class="form-group form-group-lg">
<%= f.label :aws_region, 'AWS Region', class: 'col-sm-4 control-label' %>
<div class="col-sm-8">
<%= f.text_field(
diff --git a/app/views/backends/terraform_libvirt/new.html.erb b/app/views/backends/terraform_libvirt/new.html.erb
index ab32ab3..9de3e34 100644
--- a/app/views/backends/terraform_libvirt/new.html.erb
+++ b/app/views/backends/terraform_libvirt/new.html.erb
@@ -23,6 +23,16 @@
</div>
<div class="form-group form-group-lg">
+ <%= f.label :domain, class: 'col-sm-2 control-label' %>
+ <div class="col-sm-10">
+ <%= f.text_field(
+ :domain,
+ class: 'form-control'
+ ) %>
+ </div>
+ </div>
+
+ <div class="form-group form-group-lg">
<%= f.label :uri, 'URI', class: 'col-sm-2 control-label' %>
<div class="col-sm-10">
<%= f.text_field(
diff --git a/app/views/backends/terraform_libvirt/show.html.erb b/app/views/backends/terraform_libvirt/show.html.erb
index 14b02dc..cfbc51c 100644
--- a/app/views/backends/terraform_libvirt/show.html.erb
+++ b/app/views/backends/terraform_libvirt/show.html.erb
@@ -22,12 +22,19 @@
</div>
<div class="form-group form-group-lg">
- <%= f.label :uri, class: 'col-sm-2 control-label' %>
+ <%= f.label :domain, class: 'col-sm-2 control-label' %>
<div class="col-sm-10">
- <%= f.text_field :uri, class: 'form-control' %>
+ <%= f.text_field :domain, class: 'form-control', readonly: true %>
</div>
</div>
-
+
+ <div class="form-group form-group-lg">
+ <%= f.label :uri, 'URI', class: 'col-sm-2 control-label' %>
+ <div class="col-sm-10">
+ <%= f.text_field :uri, class: 'form-control', readonly: true %>
+ </div>
+ </div>
+
<div class="form-group form-group-lg">
<div class="col-sm-offset-2 col-sm-10">
<%= f.submit "Save", class: 'btn btn-lg btn-success' %>
diff --git a/app/views/mini_environments/show.html.erb b/app/views/mini_environments/show.html.erb
index 2895330..fab9e44 100644
--- a/app/views/mini_environments/show.html.erb
+++ b/app/views/mini_environments/show.html.erb
@@ -7,7 +7,7 @@
<div class="row">
<div class="col-md-9">
<a class="btn btn-primary btn-lg"
- href="https://signon.<%= @mini_environment.name.parameterize %>.aws.cbaines.net">
+ href="<%= @mini_environment.backend.signon_url(@mini_environment) %>">
View
</a>