Ecs reco

package.json

@@ -7,9 +7,9 @@
   "devDependencies": {
     "bower": "^1.8.12",
     "pulp": "^15.0.0",
-    "purescript": "^0.14.0",
-    "purty": "^6.2.0",
-    "spago": "^0.15.2"
+    "purescript": "^0.14.2",
+    "purty": "^7.0.0",
+    "spago": "^0.20.3"
   },
   "dependencies": {
     "aws-sdk": "^2.665.0"

packages.dhall

@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210309/packages.dhall sha256:585332a8a11c6420d7287943f81bc2121746cdd352f2cf3f5ecf65053f2afcd3
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210613/packages.dhall sha256:64d7b5a1921e8458589add8a1499a1c82168e726a87fc4f958b3f8760cca2efe
 
 let overrides = {=}
 

spago.dhall

@@ -1,19 +1,36 @@
 { name = "purescript-aws-sdk-basic"
 , dependencies =
-  [ "aff-promise"
+  [ "aff"
+  , "aff-promise"
   , "argonaut"
   , "argonaut-codecs"
+  , "arrays"
+  , "bifunctors"
   , "console"
   , "datetime"
+  , "debug"
   , "effect"
+  , "either"
+  , "exceptions"
   , "foreign"
+  , "foreign-object"
   , "formatters"
+  , "functions"
+  , "integers"
   , "js-date"
   , "justifill"
+  , "maybe"
   , "monad-control"
+  , "newtype"
   , "node-buffer"
   , "nullable"
   , "numbers"
+  , "ordered-collections"
+  , "prelude"
+  , "record"
+  , "transformers"
+  , "tuples"
+  , "unfoldable"
   ]
 , packages = ./packages.dhall
 , sources = [ "src/**/*.purs" ]

src/AWS/CloudWatch/Cloudwatch.purs

@@ -1,18 +1,19 @@
 module AWS.CloudWatch
   ( CloudWatch
   , makeClient
-  , InternalGetMetricStatisticsOutput
-  , InternalMetricDatapoint
-  , getMetricStatistics
+  , getMetricStatisticsAverage
+  , getMetricStatisticsMaximum
   ) where
 
 import Prelude
+import AWS.CloudWatch.Types (Dimension, GetMetricStatisticsOutput, MetricDatapointMaximum, MetricSettings, Statistics, MetricDatapointAverage)
 import AWS.Core.Client (makeClientHelper)
-import AWS.Core.Types (DefaultClientProps, InstanceId)
+import AWS.Core.Types (DefaultClientProps)
 import AWS.Core.Util (handleError)
 import Control.Promise (Promise)
 import Control.Promise as Promise
-import Data.Argonaut (Json, decodeJson, parseJson)
+import Data.Argonaut (Json, parseJson)
+import Data.Argonaut.Decode (decodeJson)
 import Data.Bifunctor (lmap)
 import Data.DateTime (DateTime)
 import Data.Either (Either)
@@ -55,36 +56,77 @@ type InternalGetMetricsStatisticsParams
     , "Statistics" :: Array String
     }
 
-type InternalMetricDatapoint
-  = { "Timestamp" :: String
-    , "Maximum" :: Number
-    , "Unit" :: String
-    }
+type InternalDimension
+  = { "Name" :: String, "Value" :: String }
 
-type InternalGetMetricStatisticsOutput
-  = { "ResponseMetadata" :: { "RequestId" :: String }
-    , "Label" :: String
-    , "Datapoints" :: Array InternalMetricDatapoint
-    }
+toInternalDimension :: Dimension -> InternalDimension
+toInternalDimension dimension =
+  { "Name": show dimension.name
+  , "Value": unwrap dimension.value
+  }
+
+toInternalGetMetricStatisticsParams ::
+  forall a.
+  { start :: DateTime, end :: DateTime | a } ->
+  Statistics ->
+  MetricSettings ->
+  InternalGetMetricsStatisticsParams
+toInternalGetMetricStatisticsParams range statistics ms =
+  { "Namespace": nameSpace
+  , "MetricName": metricName
+  , "Dimensions": dimensions
+  , "Statistics": stat
+  , "StartTime": start
+  , "EndTime": end
+  , "Period": 86400 -- 1Day
+  }
+  where
+  nameSpace = show ms.nameSpace
+
+  metricName = show ms.metricName
+
+  dimensions = ms.dimensions <#> toInternalDimension
 
-foreign import data GetMetricStatisticsResponse :: Type
+  stat = statistics <#> show
+
+  start = fromDateTime range.start
+
+  end = fromDateTime range.end
 
 foreign import getMetricStatisticsImpl :: Fn2 CloudWatch InternalGetMetricsStatisticsParams (Effect (Promise String))
 
-getMetricStatistics :: forall a. CloudWatch -> { start :: DateTime, end :: DateTime | a } -> InstanceId -> Aff (Either String InternalGetMetricStatisticsOutput)
-getMetricStatistics cw range instanceId = liftEffect curried >>= Promise.toAff <#> parse
+curried ::
+  forall a.
+  CloudWatch ->
+  { start :: DateTime, end :: DateTime | a } ->
+  Statistics ->
+  MetricSettings ->
+  Effect (Promise String)
+curried cw range statistics ms = runFn2 getMetricStatisticsImpl cw params
+  where
+  params :: InternalGetMetricsStatisticsParams
+  params = toInternalGetMetricStatisticsParams range statistics ms
+
+getMetricStatisticsMaximum ::
+  forall a.
+  CloudWatch ->
+  { start :: DateTime, end :: DateTime | a } ->
+  Statistics ->
+  MetricSettings ->
+  Aff (Either String (GetMetricStatisticsOutput MetricDatapointMaximum))
+getMetricStatisticsMaximum cw range statistics ms = liftEffect (curried cw range statistics ms) >>= Promise.toAff <#> parse
   where
-  parse :: String -> Either String InternalGetMetricStatisticsOutput
+  parse :: String -> Either String (GetMetricStatisticsOutput MetricDatapointMaximum)
   parse = (parseJson >=> decodeJson) >>> lmap handleError
 
-  curried :: Effect (Promise String)
-  curried =
-    runFn2 getMetricStatisticsImpl cw
-      { "Namespace": "AWS/EC2"
-      , "MetricName": "CPUUtilization"
-      , "Dimensions": [ { "Name": "InstanceId", "Value": unwrap instanceId } ]
-      , "Statistics": [ "Maximum" ]
-      , "StartTime": fromDateTime range.start
-      , "EndTime": fromDateTime range.end
-      , "Period": 86400
-      }
+getMetricStatisticsAverage ::
+  forall a.
+  CloudWatch ->
+  { start :: DateTime, end :: DateTime | a } ->
+  Statistics ->
+  MetricSettings ->
+  Aff (Either String (GetMetricStatisticsOutput MetricDatapointAverage))
+getMetricStatisticsAverage cw range statistics ms = liftEffect (curried cw range statistics ms) >>= Promise.toAff <#> parse
+  where
+  parse :: String -> Either String (GetMetricStatisticsOutput MetricDatapointAverage)
+  parse = (parseJson >=> decodeJson) >>> lmap handleError

src/AWS/CloudWatch/Types.purs

@@ -0,0 +1,80 @@
+module AWS.CloudWatch.Types where
+
+import Data.Newtype (class Newtype)
+import Prelude (class Show)
+
+data Statistic
+  = Minimum
+  | Maximum
+  | Average
+  | SampleCount
+  | Sum
+
+instance showStatistic :: Show Statistic where
+  show Minimum = "Minimum"
+  show Maximum = "Maximum"
+  show Average = "Average"
+  show SampleCount = "SampleCount"
+  show Sum = "Sum"
+
+type Statistics
+  = Array Statistic
+
+newtype DimensionValue
+  = DimensionValue String
+
+derive instance ntDimensionValue :: Newtype DimensionValue _
+
+derive newtype instance showDimensionValue :: Show DimensionValue
+
+data NameSpace
+  = EC2
+  | ECS
+
+instance showNameSpace :: Show NameSpace where
+  show EC2 = "AWS/EC2"
+  show ECS = "AWS/ECS"
+
+data DimensionName
+  = EC2InstanceId
+  | ClusterName
+
+instance showDimensionName :: Show DimensionName where
+  show EC2InstanceId = "InstanceId"
+  show ClusterName = "ClusterName"
+
+data MetricName
+  = CPUUtilization
+  | CPUReservation
+  | MemoryUtilization
+  | MemoryReservation
+
+instance showMetricName :: Show MetricName where
+  show CPUUtilization = "CPUUtilization"
+  show CPUReservation = "CPUReservation"
+  show MemoryUtilization = "MemoryUtilization"
+  show MemoryReservation = "MemoryReservation"
+
+type Dimension
+  = { name :: DimensionName, value :: DimensionValue }
+
+type MetricSettings
+  = { nameSpace :: NameSpace
+    , metricName :: MetricName
+    , dimensions :: Array Dimension
+    }
+
+type Raw
+  = ( "Timestamp" :: String, "Unit" :: String )
+
+type MetricDatapointAverage
+  = { "Average" :: Number | Raw }
+
+type MetricDatapointMaximum
+  = { "Maximum" :: Number | Raw }
+
+type GetMetricStatisticsOutput a
+  = { "ResponseMetadata" :: { "RequestId" :: String }
+    , "Label" :: String
+    , "Datapoints" :: Array a
+    }

src/AWS/Core/Client.purs

@@ -9,12 +9,13 @@ import Justifill.Justifiable (class JustifiableFields)
 import Prelude ((>>>))
 import Prim.Row (class Nub, class Union)
 import Prim.RowList (class RowToList)
+import Debug  (spy)
 
 makeClientHelper ::
   forall additionalProps client.
   EncodeJson (BasicClientProps additionalProps) =>
   (Json -> Effect client) -> BasicClientProps additionalProps -> Effect client
-makeClientHelper newClient = encodeJson >>> newClient
+makeClientHelper newClient = spy "makeClientHelper: " >>> encodeJson >>> newClient
 
 makeDefaultClient ::
   forall additionalProps output input to toRL inputRL.

src/AWS/Core/Credentials.js

@@ -2,4 +2,6 @@
 
 var AWS = require('aws-sdk')
 
-exports.newSharedIniFileCredentials = (params) => () => new AWS.SharedIniFileCredentials(params)
+exports.newSharedIniFileCredentials = (params) => () => {
+    console.log("Params SharedIniFileCredentials: ", params);
+    return new AWS.SharedIniFileCredentials(params);}