(MODE-11365) Testing artifact creation and upload to dev.

.circleci/config.yml

@@ -1,11 +1,56 @@
 version: 2
 jobs:
+  build-package:
+  working_directory: /tmp/repo
+  docker:
+    - image: monosolutions/iitesting
+    steps:
+      - checkout
+      - run: npm install
+      - run:
+          name: Build Artifact
+          command: |
+            mkdir ./artifact
+            DEPLOYABLE="${CIRCLE_PROJECT_REPONAME}-${CIRCLE_SHA1}.tar.gz"
+            cp -rf * ./artifact/
+            pushd ./artifact
+              echo "Taring ${DEPLOYABLE}"
+              tar -zcvf $DEPLOYABLE *
+            popd
+      - persist_to_workspace:
+          root: /tmp/repo
+          paths:
+            - artifact
+  upload-package:
+    environment:
+      ENVIRONMENT: "dev"
+      REGION: "eu-central-1"
+    working_directory: /tmp/repo
+    docker:
+      - image: monosolutions/awscli:latest
+    steps:
+      - attach_workspace:
+          at: /tmp/repo
+      - run:
+          name: Upload Artifact Dev
+          command: |
+            aws configure set aws_access_key_id "${AWS_DEV_ACCESS_KEY}"
+            aws configure set aws_secret_access_key "${AWS_DEV_SECRET_KEY}"
+            BUCKET="mono-deployment-${ENVIRONMENT}"
+            DEPLOYABLE="${CIRCLE_PROJECT_REPONAME}-${CIRCLE_SHA1}.tar.gz"
+            {
+              aws s3api create-bucket --bucket "${BUCKET}"
+            } || {
+              echo "Bucket is here"
+            }
+            aws s3 cp "/tmp/repo/artifact/${DEPLOYABLE}" "s3://${BUCKET}/tileserver-gl/${DEPLOYABLE}"
 deploy-to-dev:
     docker:
       - image: monosolutions/terraform:1.0.4
     working_directory: /tmp/repo
     environment:
       REGION: "eu-central-1"
+      ENVIRONMENT: "dev"
     steps:
       - checkout
       - run:
@@ -17,6 +62,8 @@ jobs:
             wget https://github.com/gruntwork-io/terragrunt/releases/download/v0.14.10/terragrunt_linux_amd64 -O terragrunt
             chmod a+x terragrunt
             mv terragrunt /bin/
+            sed -i -e "s/repo_version =/repo_version = \"${CIRCLE_SHA1}\"/g" \
+            "${REGION}/${ENVIRONMENT}/tileserver/terraform.tfvars"
       - run:
           name: Deploy tileserver to fra dev
           command: |
@@ -25,4 +72,15 @@ workflows:
   version: 2
   deploy:
     jobs:
-      - deploy-to-dev
+      - build-package:
+          filters:
+            branches:
+              only:
+                - master
+                - MODE-11365
+      - upload-package:
+          requires:
+            - build-package
+      - deploy-to-dev:
+          requires:
+            - upload-package

configuration/nginx.conf

@@ -0,0 +1,50 @@
+user  nginx;
+worker_processes  1;
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+events {
+    worker_connections  1024;
+}
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+    access_log  /var/log/nginx/access.log  main;
+    proxy_cache_path  /etc/nginx/cache  levels=1:2    keys_zone=STATIC:100m inactive=24h  max_size=30g;
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 2048;
+    server {
+        listen       80 default_server;
+        listen       [::]:80 default_server;
+        server_name  _;
+        location / {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-Proto 'https';
+            proxy_pass http://localhost:8080;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_cache            STATIC;
+            proxy_cache_valid      200  1d;
+            proxy_cache_key "$scheme$host$request_uri$cookie_user";
+            if ($request_uri ~ ^(.*)[_](.*)$) {
+                add_header 'Access-Control-Allow-Origin' '*';
+                return 301 https://$host$1-$2;
+            }
+            if ($request_uri ~ ^(.*)mono-blw(.*)$) {
+                add_header 'Access-Control-Allow-Origin' '*';
+                return 301 https://$host$1mono-blue-water$2;
+            }
+        }
+    }
+    server {
+      listen 81;
+      location / { return 400; }
+      location = /__isAlive.html {
+        return 209;
+      }
+    }
+}

deployment/eu-central-1/dev/tileserver/terraform.tfvars

@@ -16,3 +16,4 @@ mono_efs_remote_state = "dev/mono-efs/terraform.tfstate"
 mono_region = "fra"
 version = "2.1"
 state_bucket = "tg-state-eu-central-1"
+repo_version =

deployment/eu-central-1/prod/tileserver/terraform.tfvars

@@ -16,3 +16,4 @@ mono_efs_remote_state = "prod/mono-efs/terraform.tfstate"
 mono_region = "fra"
 version = "2.0"
 state_bucket = "tg-state-eu-central-1"
+repo_version =

deployment/modules/tileserver/data.tf

@@ -8,10 +8,15 @@ data "aws_ami" "amazon_linux" {
 
   filter {
     name   = "name"
-    values = ["mono-tileserver-ami *"]
+    values = ["ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*"]
   }
 
-  owners = ["self"]
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+
+  owners = ["099720109477"] # Canonical
 }
 
 data "terraform_remote_state" "mono_vpc" {
@@ -31,6 +36,9 @@ data "template_file" "shell-script" {
   template = "${file("files/user-data.sh")}"
   vars {
     efs_dns_name = "${data.terraform_remote_state.mono_efs.efs_dns_name}"
+    region = "${var.region}"
+    mono_region = "${var.mono_region}"
+    repo_version = "${var.repo_version}"
   }
 }
 

deployment/modules/tileserver/files/user-data.sh

@@ -1,6 +1,61 @@
 #!/bin/bash
 set -x
 #shellcheck disable=SC2154,SC2086,SC2035
+REGION=${region}
+ENVIRONMENT=${evironment}
+MONO_REGION=${mono_region}
+REPO_VERSION=${repo_version}
+DEPLOYABLE="tileserver-gl-$REPO_VERSION.tar.gz"
+FULL_BUCKET_URI="s3://$BUCKET/tileserver-gl/$DEPLOYABLE"
+# Setup dependencies
+sudo rm /var/lib/dpkg/lock
+curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+sudo apt install -y apt-transport-https \
+curl unzip build-essential python libcairo2-dev \
+libgles2-mesa-dev libgbm-dev libllvm3.9 libprotobuf-dev \
+libxxf86vm-dev libjpeg-dev xvfb nginx git nodejs nfs-common \
+heat-cfntools software-properties-common cloud-init
+
+# Setup environment
+sudo tee -a /etc/environment << EOL
+REGION=$REGION
+ENVIRONMENT=$ENVIRONMENT
+MONO_REGION=$MONO_REGION
+EOL
+sudo rm /etc/apt/sources.list.d/microsoft.list
+sudo groupadd nginx
+sudo useradd nginx -g nginx
+sudo mkdir -p /usr/src/app/. \
+/data/mbtiles/. \
+/tmp/uncompressed/.
+
+sudo chown -R ubuntu:ubuntu /usr/src/app/.
+# Setup project
+{
+	aws s3 cp "FULL_BUCKET_URI" /tmp/tileserver-gl.tar.gz
+	tar xzf /tmp/tileserver-gl.tar.gz -C /tmp/uncompressed/
+	# Setup map files
+	sudo mv /tmp/uncompressed/map_files/* /data/.
+	sudo chown -R ubuntu:ubuntu /data/.
+	# Setup app
+	mv /tmp/uncompressed/* /usr/src/app/.
+	# Setup nginx
+	sudo mv /tmp/uncompressed/configuration/nginx.conf /etc/nginx/.
+	# cd /usr/src/app/. && npm install	
+} || {
+	echo ""
+	echo "Failed to setup project!"
+	echo "Tried fetching FULL_BUCKET_URI: $FULL_BUCKET_URI"
+	echo ""
+	echo "Tried modifying the following directories:"
+	echo "/data/."
+	echo "/usr/src/app/."
+	echo "/etc/nginx"
+	echo ""
+}
+# git clone https://github.com/klokantech/tileserver-gl.git /home/ubuntu/tileserver-gl
+
+# Configure service
 sudo sed -i -e 's/node \/usr\/src\/app\/ -p 80 "$@" \&/node \/usr\/src\/app\/ -p 8080 "$@" -c config.json  \&/g' /usr/src/app/run.sh
 {
 	sudo mount -t nfs4 -o nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,noresvport "${efs_dns_name}:/mbtiles/" /data/mbtiles

deployment/modules/tileserver/policies/policies.json

@@ -40,6 +40,18 @@
             "Effect": "Allow",
             "Action": "logs:*",
             "Resource": "*"
+        },
+        {
+            "Sid": "",
+            "Effect": "Allow",
+            "Action": [
+                "s3:GetObject",
+                "s3:ListBucket"
+            ],
+            "Resource": [
+                "arn:aws:s3:::mono-deployment-dev",
+                "arn:aws:s3:::mono-deployment-dev/tileserver-gl/*"
+            ]
         }
     ]
 }

deployment/modules/tileserver/variables.tf

@@ -22,7 +22,7 @@ variable "version" {
 
 variable "mono_region" {
   type        = "string"
-  description = "Dns zone id"
+  description = "fra/yyz"
 }
 
 variable "mono_vpc_remote_state" {
@@ -49,3 +49,8 @@ variable "mono_alb_remote_state" {
   type = "string"
   description = "Remote state for mono_alb"
 }
+
+variable "repo_version" {
+  type = "string"
+  description = "Version of repo to fetch and setup from S3"
+}

map_files/glyphs/Open Sans Bold/10240-10495.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold10240-10495

map_files/glyphs/Open Sans Bold/10496-10751.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold10496-10751

map_files/glyphs/Open Sans Bold/10752-11007.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold10752-11007

map_files/glyphs/Open Sans Bold/11008-11263.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold11008-11263

map_files/glyphs/Open Sans Bold/11264-11519.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold11264-11519

map_files/glyphs/Open Sans Bold/11520-11775.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold11520-11775

map_files/glyphs/Open Sans Bold/11776-12031.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold11776-12031

map_files/glyphs/Open Sans Bold/12032-12287.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold12032-12287

map_files/glyphs/Open Sans Bold/12288-12543.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold12288-12543

map_files/glyphs/Open Sans Bold/12544-12799.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold12544-12799

map_files/glyphs/Open Sans Bold/12800-13055.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold12800-13055

map_files/glyphs/Open Sans Bold/13056-13311.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold13056-13311

map_files/glyphs/Open Sans Bold/13312-13567.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold13312-13567

map_files/glyphs/Open Sans Bold/13568-13823.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold13568-13823

map_files/glyphs/Open Sans Bold/13824-14079.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold13824-14079

map_files/glyphs/Open Sans Bold/14080-14335.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold14080-14335

map_files/glyphs/Open Sans Bold/14336-14591.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold14336-14591

map_files/glyphs/Open Sans Bold/14592-14847.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold14592-14847

map_files/glyphs/Open Sans Bold/14848-15103.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold14848-15103

map_files/glyphs/Open Sans Bold/15104-15359.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold15104-15359

map_files/glyphs/Open Sans Bold/1536-1791.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	1536-1791

map_files/glyphs/Open Sans Bold/15360-15615.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold15360-15615

map_files/glyphs/Open Sans Bold/15616-15871.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold15616-15871

map_files/glyphs/Open Sans Bold/15872-16127.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold15872-16127

map_files/glyphs/Open Sans Bold/16128-16383.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold16128-16383

map_files/glyphs/Open Sans Bold/16384-16639.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold16384-16639

map_files/glyphs/Open Sans Bold/16640-16895.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold16640-16895

map_files/glyphs/Open Sans Bold/16896-17151.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold16896-17151

map_files/glyphs/Open Sans Bold/17152-17407.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold17152-17407

map_files/glyphs/Open Sans Bold/17408-17663.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold17408-17663

map_files/glyphs/Open Sans Bold/17664-17919.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold17664-17919

map_files/glyphs/Open Sans Bold/1792-2047.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	1792-2047

map_files/glyphs/Open Sans Bold/17920-18175.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold17920-18175

map_files/glyphs/Open Sans Bold/18176-18431.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold18176-18431

map_files/glyphs/Open Sans Bold/18432-18687.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold18432-18687

map_files/glyphs/Open Sans Bold/18688-18943.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold18688-18943

map_files/glyphs/Open Sans Bold/18944-19199.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold18944-19199

map_files/glyphs/Open Sans Bold/19200-19455.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold19200-19455

map_files/glyphs/Open Sans Bold/19456-19711.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold19456-19711

map_files/glyphs/Open Sans Bold/19712-19967.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold19712-19967

map_files/glyphs/Open Sans Bold/19968-20223.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold19968-20223

map_files/glyphs/Open Sans Bold/20224-20479.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold20224-20479

map_files/glyphs/Open Sans Bold/2048-2303.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	2048-2303

map_files/glyphs/Open Sans Bold/20480-20735.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold20480-20735

map_files/glyphs/Open Sans Bold/20736-20991.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold20736-20991

map_files/glyphs/Open Sans Bold/20992-21247.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold20992-21247

map_files/glyphs/Open Sans Bold/21248-21503.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold21248-21503

map_files/glyphs/Open Sans Bold/21504-21759.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold21504-21759

map_files/glyphs/Open Sans Bold/21760-22015.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold21760-22015

map_files/glyphs/Open Sans Bold/22016-22271.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold22016-22271

map_files/glyphs/Open Sans Bold/22272-22527.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold22272-22527

map_files/glyphs/Open Sans Bold/22528-22783.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold22528-22783

map_files/glyphs/Open Sans Bold/22784-23039.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold22784-23039

map_files/glyphs/Open Sans Bold/2304-2559.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	2304-2559

map_files/glyphs/Open Sans Bold/23040-23295.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold23040-23295

map_files/glyphs/Open Sans Bold/23296-23551.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold23296-23551

map_files/glyphs/Open Sans Bold/23552-23807.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold23552-23807

map_files/glyphs/Open Sans Bold/23808-24063.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold23808-24063

map_files/glyphs/Open Sans Bold/24064-24319.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold24064-24319

map_files/glyphs/Open Sans Bold/24320-24575.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold24320-24575

map_files/glyphs/Open Sans Bold/24576-24831.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold24576-24831

map_files/glyphs/Open Sans Bold/24832-25087.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold24832-25087

map_files/glyphs/Open Sans Bold/25088-25343.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold25088-25343

map_files/glyphs/Open Sans Bold/25344-25599.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold25344-25599

map_files/glyphs/Open Sans Bold/2560-2815.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	2560-2815

map_files/glyphs/Open Sans Bold/25600-25855.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold25600-25855

map_files/glyphs/Open Sans Bold/25856-26111.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold25856-26111

map_files/glyphs/Open Sans Bold/26112-26367.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold26112-26367

map_files/glyphs/Open Sans Bold/26368-26623.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold26368-26623

map_files/glyphs/Open Sans Bold/26624-26879.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold26624-26879

map_files/glyphs/Open Sans Bold/26880-27135.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold26880-27135

map_files/glyphs/Open Sans Bold/27136-27391.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold27136-27391

map_files/glyphs/Open Sans Bold/27392-27647.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold27392-27647

map_files/glyphs/Open Sans Bold/27648-27903.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold27648-27903

map_files/glyphs/Open Sans Bold/27904-28159.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold27904-28159

map_files/glyphs/Open Sans Bold/2816-3071.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	2816-3071

map_files/glyphs/Open Sans Bold/28160-28415.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold28160-28415

map_files/glyphs/Open Sans Bold/28416-28671.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold28416-28671

map_files/glyphs/Open Sans Bold/28672-28927.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold28672-28927

map_files/glyphs/Open Sans Bold/28928-29183.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold28928-29183

map_files/glyphs/Open Sans Bold/29184-29439.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold29184-29439

map_files/glyphs/Open Sans Bold/29440-29695.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold29440-29695

map_files/glyphs/Open Sans Bold/29696-29951.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold29696-29951

map_files/glyphs/Open Sans Bold/29952-30207.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold29952-30207

map_files/glyphs/Open Sans Bold/30208-30463.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold30208-30463

map_files/glyphs/Open Sans Bold/30464-30719.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold30464-30719

map_files/glyphs/Open Sans Bold/3072-3327.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	3072-3327

map_files/glyphs/Open Sans Bold/30720-30975.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold30720-30975