Merge pull request #410 from ambiata/topic/generate-storage

generate storage info for ec2 types
haskell-mafia · Jun 18, 2019 · a44c325 · a44c325
2 parents 6fc6437 + 85a0c91
commit a44c325
Show file tree

Hide file tree

Showing 48 changed files with 459 additions and 256 deletions.
diff --git a/bin/update-versions.sh b/bin/update-versions.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -eux
+find $(git rev-parse --show-toplevel) -maxdepth 3 -name 'ambiata-mismi-*.cabal' \
+  | xargs -n1 \
+    sed -i -E "s;^(version: +).*;\1${1};"
diff --git a/framework/mafia b/framework/mafia
@@ -45,13 +45,13 @@ enable_version() {
     else
         MAFIA_VERSION="$1"
     fi
-    [ -x "$MAFIA_HOME/versions/mafia-$MAFIA_VERSION" ] || build_version "$MAFIA_VERSION"
-    ln -sf "$MAFIA_HOME/versions/mafia-$MAFIA_VERSION" "$MAFIA_HOME/versions/mafia"
+    [ -x "${MAFIA_VERSIONS}/mafia-$MAFIA_VERSION" ] || build_version "$MAFIA_VERSION"
+    ln -sf "${MAFIA_VERSIONS}/mafia-$MAFIA_VERSION" "${MAFIA_VERSIONS}/mafia"
 }
 
 exec_mafia () {
-    [ -x "$MAFIA_HOME/versions/mafia" ] || enable_version
-    "$MAFIA_HOME/versions/mafia" "$@"
+    [ -x "${MAFIA_VERSIONS}/mafia" ] || enable_version
+    "${MAFIA_VERSIONS}/mafia" "$@"
 }
 
 #

diff --git a/framework/master-with-test.toml b/framework/master-with-test.toml
@@ -1,51 +1,44 @@
 [master]
-  runner = "s3://ambiata-dispensary-v2/dist/master/master-haskell/linux/x86_64/20190117000143-201595f/master-haskell-20190117000143-201595f"
+  runner = "s3://ambiata-dispensary-v2/dist/master/master-haskell/linux/x86_64/20190522002346-e28326d/master-haskell-20190522002346-e28326d"
   version = 1
-  sha1 = "3ba53248015b00824f90ca497b5d3bcce5699608"
+  sha1 = "8736bd36b35b88909893e565f97ae5f91c009fd1"
 
 [global]
   CACHE = "true"
+  CABAL_VERSION = "1.24.0.2"
 
 [build.dist-7-10]
   HADDOCK = "true"
   HADDOCK_S3 = "$AMBIATA_HADDOCK_MASTER"
   GHC_VERSION = "7.10.2"
-  CABAL_VERSION = "1.24.0.2"
 
 [build.branches-7-10]
   HADDOCK = "true"
   HADDOCK_S3 = "$AMBIATA_HADDOCK_BRANCHES"
   GHC_VERSION = "7.10.2"
-  CABAL_VERSION = "1.24.0.2"
 
 [build.dist-8-0]
   GHC_VERSION = "8.0.2"
-  CABAL_VERSION = "1.24.0.2"
 
 [build.branches-8-0]
   GHC_VERSION = "8.0.2"
-  CABAL_VERSION = "1.24.0.2"
 
 [build.dist-7-10-cabal-test]
   GHC_VERSION = "7.10.2"
-  CABAL_VERSION = "1.24.0.2"
   TEST = "false"
   CABAL_TEST = "true"
 
 [build.branches-7-10-cabal-test]
   GHC_VERSION = "7.10.2"
-  CABAL_VERSION = "1.24.0.2"
   TEST = "false"
   CABAL_TEST = "true"
 
 [build.dist-8-0-cabal-test]
   GHC_VERSION = "8.0.2"
-  CABAL_VERSION = "1.24.0.2"
   TEST = "false"
   CABAL_TEST = "true"
 
 [build.branches-8-0-cabal-test]
   GHC_VERSION = "8.0.2"
-  CABAL_VERSION = "1.24.0.2"
   TEST = "false"
   CABAL_TEST = "true"
diff --git a/mismi-autoscaling-core/ambiata-mismi-autoscaling-core.cabal b/mismi-autoscaling-core/ambiata-mismi-autoscaling-core.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-autoscaling-core
-version:               0.1.5
+version:               0.1.6
 license:               Apache-2.0
 license-file:          LICENSE
 author:                Ambiata <info@ambiata.com>

diff --git a/mismi-autoscaling-core/test/ambiata-mismi-autoscaling-core-test.cabal b/mismi-autoscaling-core/test/ambiata-mismi-autoscaling-core-test.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-autoscaling-core-test
-version:               0.1.5
+version:               0.1.6
 cabal-version:         >= 1.8
 build-type:            Simple
 

diff --git a/mismi-autoscaling/ambiata-mismi-autoscaling.cabal b/mismi-autoscaling/ambiata-mismi-autoscaling.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-autoscaling
-version:               0.1.5
+version:               0.1.6
 license:               Apache-2.0
 license-file:          LICENSE
 author:                Ambiata <info@ambiata.com>

diff --git a/mismi-autoscaling/test/Test/IO/Mismi/Autoscaling/Commands.hs b/mismi-autoscaling/test/Test/IO/Mismi/Autoscaling/Commands.hs
@@ -7,6 +7,7 @@
 module Test.IO.Mismi.Autoscaling.Commands where
 
 import           Control.Monad.IO.Class (liftIO)
+import           Control.Concurrent (threadDelay)
 
 import           Control.Retry (retrying, limitRetries, constantDelay)
 
@@ -88,6 +89,7 @@ prop_update_tags = forAll ((,) <$> elements simpsons <*> elements boats) $ \(k,
     conf <- conf' c
     createConfiguration conf
     createGroup $ group' c g 0
+    liftIO $ threadDelay 1000000
     let tag = GroupTag (EC2Tag k v) Propagate
     updateTags g [tag]
     m <- runEitherT $ describeGroup g
@@ -105,6 +107,7 @@ prop_scale_in_invalid_state = once . testGroup $ \c g -> do
   conf <- conf' c
   createConfiguration conf
   createGroup $ group' c g 1
+  liftIO $ threadDelay 1000000
 
   let retryX action =
         retrying

diff --git a/mismi-autoscaling/test/ambiata-mismi-autoscaling-test.cabal b/mismi-autoscaling/test/ambiata-mismi-autoscaling-test.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-autoscaling-test
-version:               0.1.5
+version:               0.1.6
 cabal-version:         >= 1.8
 build-type:            Simple
 

diff --git a/mismi-cli/ambiata-mismi-cli.cabal b/mismi-cli/ambiata-mismi-cli.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-cli
-version:               0.1.5
+version:               0.1.6
 license:               Apache-2.0
 license-file:          LICENSE
 author:                Ambiata <info@ambiata.com>

diff --git a/mismi-cli/master.toml b/mismi-cli/master.toml
@@ -5,25 +5,22 @@
 
 [global]
   CACHE = "true"
+  CABAL_VERSION = "1.24.0.2"
 
 [build.dist-7-10]
   GHC_VERSION = "7.10.2"
-  CABAL_VERSION = "1.24.0.2"
 
 [build.branches-7-10]
   GHC_VERSION = "7.10.2"
-  CABAL_VERSION = "1.24.0.2"
 
 [build.dist-8-0]
   GHC_VERSION = "8.0.2"
-  CABAL_VERSION = "1.24.0.2"
   PUBLISH = "true"
   PUBLISH_S3 = "$AMBIATA_ARTEFACTS_MASTER"
   PUBLISH_EXECUTABLES = "s3"
 
 [build.branches-8-0]
   GHC_VERSION = "8.0.2"
-  CABAL_VERSION = "1.24.0.2"
   PUBLISH = "true"
   PUBLISH_S3 = "$AMBIATA_ARTEFACTS_BRANCHES"
   PUBLISH_EXECUTABLES = "s3"
diff --git a/mismi-cloudwatch-logs/ambiata-mismi-cloudwatch-logs.cabal b/mismi-cloudwatch-logs/ambiata-mismi-cloudwatch-logs.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-cloudwatch-logs
-version:               0.1.5
+version:               0.1.6
 license:               Apache-2.0
 license-file:          LICENSE
 author:                Ambiata <info@ambiata.com>

diff --git a/mismi-cloudwatch-logs/test/ambiata-mismi-cloudwatch-logs-test.cabal b/mismi-cloudwatch-logs/test/ambiata-mismi-cloudwatch-logs-test.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-cloudwatch-logs-test
-version:               0.1.5
+version:               0.1.6
 cabal-version:         >= 1.8
 build-type:            Simple
 

diff --git a/mismi-cloudwatch/ambiata-mismi-cloudwatch.cabal b/mismi-cloudwatch/ambiata-mismi-cloudwatch.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-cloudwatch
-version:               0.1.5
+version:               0.1.6
 license:               Apache-2.0
 license-file:          LICENSE
 author:                Ambiata <info@ambiata.com>

diff --git a/mismi-cloudwatch/test/ambiata-mismi-cloudwatch-test.cabal b/mismi-cloudwatch/test/ambiata-mismi-cloudwatch-test.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-cloudwatch-test
-version:               0.1.5
+version:               0.1.6
 cabal-version:         >= 1.8
 build-type:            Simple
 

diff --git a/mismi-core/ambiata-mismi-core.cabal b/mismi-core/ambiata-mismi-core.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-core
-version:               0.1.5
+version:               0.1.6
 license:               Apache-2.0
 license-file:          LICENSE
 author:                Ambiata <info@ambiata.com>

diff --git a/mismi-core/test/ambiata-mismi-core-test.cabal b/mismi-core/test/ambiata-mismi-core-test.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-core-test
-version:               0.1.5
+version:               0.1.6
 cabal-version:         >= 1.8
 build-type:            Simple
 

diff --git a/mismi-dynamodb/ambiata-mismi-dynamodb.cabal b/mismi-dynamodb/ambiata-mismi-dynamodb.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-dynamodb
-version:               0.1.5
+version:               0.1.6
 license:               Apache-2.0
 license-file:          LICENSE
 author:                Ambiata <info@ambiata.com>

diff --git a/mismi-ec2-core/ambiata-mismi-ec2-core.cabal b/mismi-ec2-core/ambiata-mismi-ec2-core.cabal
@@ -1,5 +1,5 @@
 name:                  ambiata-mismi-ec2-core
-version:               0.1.5
+version:               0.1.6
 license:               Apache-2.0
 license-file:          LICENSE
 author:                Ambiata <info@ambiata.com>

diff --git a/mismi-ec2-core/scripts/.gitignore b/mismi-ec2-core/scripts/.gitignore
@@ -0,0 +1 @@
+*.csv