From c702f039ce4b4657aa05fde9c93fe7b464936129 Mon Sep 17 00:00:00 2001
From: Andrea Fazzi <posta@andreafazzi.eu>
Date: Sat, 29 Feb 2020 11:45:22 +0100
Subject: [PATCH] Add AWS files for CD/CI

---
 aws/imagedefinitions.json       |   6 +++
 aws/imagedefinitions.zip        | Bin 0 -> 291 bytes
 aws/oef-pipeline.json           |  93 ++++++++++++++++++++++++++++++++
 renderer/funcmap.go             |   2 +-
 templates/layout/login.html.tpl |   3 +-
 5 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 aws/imagedefinitions.json
 create mode 100644 aws/imagedefinitions.zip
 create mode 100644 aws/oef-pipeline.json

diff --git a/aws/imagedefinitions.json b/aws/imagedefinitions.json
new file mode 100644
index 00000000..d307548f
--- /dev/null
+++ b/aws/imagedefinitions.json
@@ -0,0 +1,6 @@
+[
+  {
+    "name": "oef",
+    "imageUri": "185273882442.dkr.ecr.eu-central-1.amazonaws.com/oef:latest"
+  }
+]
diff --git a/aws/imagedefinitions.zip b/aws/imagedefinitions.zip
new file mode 100644
index 0000000000000000000000000000000000000000..023c5969f297cd812a15d84bd50199e8313bce7a
GIT binary patch
literal 291
zcmWIWW@Zs#U|`^2SUfE<ApA<+m1H0<2Z%)(WEe7Y6Vp>uQqwZ?GD|Y^^NRJdiu3bA
zLpT|j8RJ9a=9omql~!;wFtWU0W?%pl-OqvoR<I?pvM$|o<W7jHHtW(qS4>o8I|9=3
zlB%*Y0@XZjTsU;)#GM<54xKo1#6w?ow}-x|WQTX@<lxU<T|&hrykCWig;#(2EOfg2
z>!i=cUmK4_JXM*tL~ObSBk$^`T~C=90=yZS<d|`}Spw*C1_nkTUeX9+;qU<~#0O}u
U5AbGX18HIe!e}793B+Ll0P46}i~s-t

literal 0
HcmV?d00001

diff --git a/aws/oef-pipeline.json b/aws/oef-pipeline.json
new file mode 100644
index 00000000..39b5d726
--- /dev/null
+++ b/aws/oef-pipeline.json
@@ -0,0 +1,93 @@
+{
+    "pipeline": {
+        "name": "oef",
+        "roleArn": "arn:aws:iam::185273882442:role/service-role/AWSCodePipelineServiceRole-eu-central-1-oef",
+        "artifactStore": {
+            "type": "S3",
+            "location": "codepipeline-eu-central-1-790111279784"
+        },
+        "stages": [
+            {
+                "name": "Source",
+                "actions": [
+                    {
+                        "name": "Source",
+                        "actionTypeId": {
+                            "category": "Source",
+                            "owner": "AWS",
+                            "provider": "ECR",
+                            "version": "1"
+                        },
+                        "runOrder": 1,
+                        "configuration": {
+                            "ImageTag": "latest",
+                            "RepositoryName": "oef"
+                        },
+                        "outputArtifacts": [
+                            {
+                                "name": "SourceArtifact"
+                            }
+                        ],
+                        "inputArtifacts": [],
+                        "region": "eu-central-1",
+                        "namespace": "SourceVariables"
+                    },
+                    {
+                        "name": "imagedefinitions",
+                        "actionTypeId": {
+                            "category": "Source",
+                            "owner": "AWS",
+                            "provider": "S3",
+                            "version": "1"
+                        },
+                        "runOrder": 1,
+                        "configuration": {
+                            "PollForSourceChanges": "false",
+                            "S3Bucket": "codepipeline-eu-central-1-790111279784",
+                            "S3ObjectKey": "oef/SourceArti/imagedefinitions.zip"
+                        },
+                        "outputArtifacts": [
+                            {
+                                "name": "imagedefjson"
+                            }
+                        ],
+                        "inputArtifacts": [],
+                        "region": "eu-central-1"
+                    }
+                ]
+            },
+            {
+                "name": "Deploy",
+                "actions": [
+                    {
+                        "name": "Deploy",
+                        "actionTypeId": {
+                            "category": "Deploy",
+                            "owner": "AWS",
+                            "provider": "ECS",
+                            "version": "1"
+                        },
+                        "runOrder": 1,
+                        "configuration": {
+                            "ClusterName": "default",
+                            "ServiceName": "oef-service"
+                        },
+                        "outputArtifacts": [],
+                        "inputArtifacts": [
+                            {
+                                "name": "imagedefjson"
+                            }
+                        ],
+                        "region": "eu-central-1"
+                    }
+                ]
+            }
+        ],
+        "version": 5
+    },
+    "metadata": {
+        "pipelineArn": "arn:aws:codepipeline:eu-central-1:185273882442:oef",
+        "created": "2020-02-29T11:15:29.906000+01:00",
+        "updated": "2020-02-29T11:39:18.093000+01:00"
+    }
+}
diff --git a/renderer/funcmap.go b/renderer/funcmap.go
index b079848e..51c34bbc 100644
--- a/renderer/funcmap.go
+++ b/renderer/funcmap.go
@@ -95,7 +95,7 @@ func version() string {
 	if err != nil {
 		return ""
 	}
-	return string(version)
+	return strings.TrimSpace(string(version))
 }
 
 func toInt(value float64) int {
diff --git a/templates/layout/login.html.tpl b/templates/layout/login.html.tpl
index 42058533..33146005 100644
--- a/templates/layout/login.html.tpl
+++ b/templates/layout/login.html.tpl
@@ -37,8 +37,7 @@
 
     <footer class="footer text-center">
       <div class="container">
-        <span class="text-center text-muted">Questo software è stato sviluppato da <a href="https://github.com/remogatto">Andrea
-    	    Fazzi</a> per le <a href="https://www.olimpiadi-economiaefinanza.it">Olimpiadi di Economia e Finanza 2020</a> ({{version}})
+        <span class="text-center text-muted">Piattaforma di gara sviluppata per le <a href="https://www.olimpiadi-economiaefinanza.it">Olimpiadi di Economia e Finanza 2020</a> ({{version}})
     	</span>
       </div>
     </footer>