Add form field for new field. XLarge not Xlarge

guardian · Jan 17, 2025 · aed5082 · aed5082
1 parent f7c0d32
commit aed5082
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 16 deletions.
diff --git a/app/controllers/BaseImageController.scala b/app/controllers/BaseImageController.scala
@@ -56,7 +56,7 @@ class BaseImageController(
           image.amiId,
           image.linuxDist.getOrElse(Ubuntu),
           image.eolDate.getOrElse(DateTime.now).toLocalDate.toDate,
-          image.requiresXlargeBuilder
+          image.requiresXLargeBuilder
         )
       )
       Ok(views.html.editBaseImage(image, form, Roles.listIds))
@@ -80,7 +80,7 @@ class BaseImageController(
                     amiId,
                     linuxDist,
                     eolDate,
-                    requiresXlargeBuilder
+                    requiresXLargeBuilder
                   ) =>
                 val customisedRoles = parseEnabledRoles(request.body)
                 customisedRoles.fold(
@@ -94,7 +94,7 @@ class BaseImageController(
                       roles,
                       modifiedBy = request.user.fullName,
                       new DateTime(eolDate),
-                      requiresXlargeBuilder
+                      requiresXLargeBuilder
                     )
                     Redirect(routes.BaseImageController.showBaseImage(id))
                       .flashing("info" -> "Successfully updated base image")
@@ -123,7 +123,7 @@ class BaseImageController(
                 amiId,
                 linuxDist,
                 eolDate,
-                requiresXlargeBuilder
+                requiresXLargeBuilder
               ) =>
             BaseImages.findById(id) match {
               case Some(existingImage) =>
@@ -135,7 +135,7 @@ class BaseImageController(
                       amiId,
                       linuxDist,
                       eolDate,
-                      requiresXlargeBuilder
+                      requiresXLargeBuilder
                     )
                   )
                   .withError("id", "This base image ID is already in use")
@@ -153,7 +153,7 @@ class BaseImageController(
                       createdBy = request.user.fullName,
                       linuxDist,
                       Some(new DateTime(eolDate)),
-                      requiresXlargeBuilder
+                      requiresXLargeBuilder
                     )
                     Redirect(routes.BaseImageController.showBaseImage(id))
                       .flashing("info" -> "Successfully created base image")
@@ -188,7 +188,7 @@ class BaseImageController(
                       createdBy = request.user.fullName,
                       linuxDist = linuxDist,
                       eolDate = baseImage.eolDate,
-                      requiresXlargeBuilder = baseImage.requiresXlargeBuilder
+                      requiresXLargeBuilder = baseImage.requiresXLargeBuilder
                     )
                     Redirect(routes.BaseImageController.showBaseImage(newId))
                       .flashing("info" -> "Successfully cloned base image")
@@ -248,7 +248,7 @@ object BaseImageController {
         "amiId" -> amiId,
         "linuxDist" -> linuxDist,
         "eolDate" -> date("yyyy-MM-dd"),
-        "requiresXlargeBuilder" -> boolean
+        "requiresXLargeBuilder" -> boolean
       )
     )
 
@@ -260,7 +260,7 @@ object BaseImageController {
         "amiId" -> amiId,
         "linuxDist" -> linuxDist,
         "eolDate" -> date("yyyy-MM-dd"),
-        "requiresXlargeBuilder" -> boolean
+        "requiresXLargeBuilder" -> boolean
       )
     )
 

diff --git a/app/data/BaseImages.scala b/app/data/BaseImages.scala
@@ -15,7 +15,7 @@ object BaseImages {
       createdBy: String,
       linuxDist: LinuxDist,
       eolDate: Option[DateTime],
-      requiresXlargeBuilder: Boolean
+      requiresXLargeBuilder: Boolean
   )(implicit dynamo: Dynamo): BaseImage = {
     val now = DateTime.now()
     val baseImage = BaseImage(
@@ -29,7 +29,7 @@ object BaseImages {
       modifiedAt = now,
       Some(linuxDist),
       eolDate,
-      requiresXlargeBuilder
+      requiresXLargeBuilder
     )
 
     table.put(baseImage).exec()
@@ -44,7 +44,7 @@ object BaseImages {
       builtinRoles: List[CustomisedRole],
       modifiedBy: String,
       eolDate: DateTime,
-      requiresXlargeBuilder: Boolean
+      requiresXLargeBuilder: Boolean
   )(implicit dynamo: Dynamo): Unit = {
     val updated = baseImage.copy(
       description = description,
@@ -54,7 +54,7 @@ object BaseImages {
       modifiedBy = modifiedBy,
       modifiedAt = DateTime.now(),
       eolDate = Some(eolDate),
-      requiresXlargeBuilder = requiresXlargeBuilder
+      requiresXLargeBuilder = requiresXLargeBuilder
     )
     table.put(updated).exec()
   }

diff --git a/app/models/BaseImage.scala b/app/models/BaseImage.scala
@@ -111,7 +111,7 @@ case class BaseImage(
     modifiedAt: DateTime,
     linuxDist: Option[LinuxDist] = None,
     eolDate: Option[DateTime] = None,
-    requiresXlargeBuilder: Boolean = false
+    requiresXLargeBuilder: Boolean = false
 )
 
 sealed trait EolStatus

diff --git a/app/packer/PackerRunner.scala b/app/packer/PackerRunner.scala
@@ -73,7 +73,7 @@ class PackerRunner(maxInstances: Int) extends Loggable {
         awsAccountNumbers,
         amiMetadata,
         amigoDataBucket,
-        bake.recipe.baseImage.requiresXlargeBuilder
+        bake.recipe.baseImage.requiresXLargeBuilder
       )
     val packerJson = Json.prettyPrint(Json.toJson(packerBuildConfig))
     val packerConfigFile =

diff --git a/app/views/editBaseImage.scala.html b/app/views/editBaseImage.scala.html
@@ -20,6 +20,15 @@
     <p>(Find Ubuntu support info <a href="https://wiki.ubuntu.com/Releases" target="_blank">here</a>)</p>
       </div>
     </div>
+    <div class="row">
+      <div class="col-md-1"></div>
+      <div class="col-md-6">
+      @b3.checkbox(form("requiresXLargeBuilder"), Symbol("_label") -> "Requires XLarge builder instance")
+      </div>
+      <div class="col-md-3">
+        <p>Note - XLarge instances are 8x more expensive than normal AMIgo builders. Avoid where possible.</p>
+      </div>
+    </div>
     <div class="form-group">
       <label class="control-label col-md-2" for="builtin-roles">Builtin roles</label>
       <div class="col-md-10" id="builtin-roles">

diff --git a/app/views/newBaseImage.scala.html b/app/views/newBaseImage.scala.html
@@ -13,6 +13,8 @@
     @b3.textarea( form("description"), Symbol("_label") -> "Description" )
     @b3.date(form("eolDate"), Symbol("_label")-> "End of Life Date")
     <p>(Find Ubuntu support info <a href="https://wiki.ubuntu.com/Releases">here</a></p>
+    @b3.checkbox(form("requiresXLargeBuilder"), Symbol("_label") -> "Requires XLarge builder instance")
+    <p>Note - XLarge instances are 8x more expensive than normal AMIgo builders. Avoid where possible.</p>
 
     <div class="form-group">
       <label class="control-label col-md-2" for="builtin-roles">Builtin roles</label>

diff --git a/app/views/showBaseImage.scala.html b/app/views/showBaseImage.scala.html
@@ -43,6 +43,13 @@ <h1>@image.id.value</h1>
     </div>
   </div>
 
+  <div class="panel panel-default">
+    <div class="panel-heading">Requires XLarge builder instance</div>
+    <div class="panel-body">
+    @image.requiresXLargeBuilder
+    </div>
+  </div>
+
   <div class="panel panel-default">
     <div class="panel-heading">Builtin roles</div>
     <div class="panel-body">
@@ -64,4 +71,4 @@ <h1>@image.id.value</h1>
     </div>
   </div>
 
-}
+}