From 5f2fffe291406cc9bd5c4f8b6a1b5e28ead7aa0d Mon Sep 17 00:00:00 2001 From: Markus Schirp Date: Thu, 16 May 2024 01:17:54 +0000 Subject: [PATCH 1/2] Upgrade to LTS 22.21 --- aws-checkip/test/stack-9.6-dependencies.txt | 2 +- aws-rds/test/stack-9.6-dependencies.txt | 2 +- aws-secrets/test/stack-9.6-dependencies.txt | 6 +++--- .../test/stack-9.6-dependencies.txt | 6 +++--- bounded/test/stack-9.6-dependencies.txt | 2 +- cbt/test/stack-9.6-dependencies.txt | 2 +- cli-utils/test/stack-9.6-dependencies.txt | 2 +- conversions/test/stack-9.6-dependencies.txt | 2 +- dbt/test/stack-9.6-dependencies.txt | 4 ++-- devtools/test/stack-9.6-dependencies.txt | 2 +- http-mclient/test/stack-9.6-dependencies.txt | 2 +- lambda-alb/test/stack-9.6-dependencies.txt | 2 +- lambda-runtime/test/stack-9.6-dependencies.txt | 2 +- lht/test/stack-9.6-dependencies.txt | 2 +- mio-amazonka/test/stack-9.6-dependencies.txt | 6 +++--- mio-core/test/stack-9.6-dependencies.txt | 2 +- mio-log/test/stack-9.6-dependencies.txt | 2 +- oauth/test/stack-9.6-dependencies.txt | 2 +- openapi/test/stack-9.6-dependencies.txt | 2 +- pgt/test/stack-9.6-dependencies.txt | 4 ++-- stack-9.6.yaml | 3 +-- stack-9.6.yaml.lock | 8 ++++---- stack-deploy/test/stack-9.6-dependencies.txt | 6 +++--- xray/test/stack-9.6-dependencies.txt | 2 +- 24 files changed, 37 insertions(+), 38 deletions(-) diff --git a/aws-checkip/test/stack-9.6-dependencies.txt b/aws-checkip/test/stack-9.6-dependencies.txt index 7da3aa7e..d37e4d5a 100644 --- a/aws-checkip/test/stack-9.6-dependencies.txt +++ b/aws-checkip/test/stack-9.6-dependencies.txt @@ -141,7 +141,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 socks 0.6.1 source-constraints 0.0.5 diff --git a/aws-rds/test/stack-9.6-dependencies.txt b/aws-rds/test/stack-9.6-dependencies.txt index d64122ad..45ac3344 100644 --- a/aws-rds/test/stack-9.6-dependencies.txt +++ b/aws-rds/test/stack-9.6-dependencies.txt @@ -99,7 +99,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 source-constraints 0.0.5 split 0.2.5 splitmix 0.1.0.5 diff --git a/aws-secrets/test/stack-9.6-dependencies.txt b/aws-secrets/test/stack-9.6-dependencies.txt index 1ea3dfd3..f08be14f 100644 --- a/aws-secrets/test/stack-9.6-dependencies.txt +++ b/aws-secrets/test/stack-9.6-dependencies.txt @@ -122,7 +122,7 @@ integer-gmp 1.1 integer-logarithms 1.0.3.1 invariant 0.6.3 iproute 1.7.12 -kan-extensions 5.2.5 +kan-extensions 5.2.6 lambda-runtime 0.0.2 lens 5.2.3 libyaml 0.1.4 @@ -161,7 +161,7 @@ process 1.6.19.0 profunctors 5.6.2 random 1.2.1.2 refact 0.3.0.2 -reflection 2.1.7 +reflection 2.1.8 regex-base 0.94.0.2 regex-posix 0.96.0.1 resourcet 1.3.0 @@ -170,7 +170,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 socks 0.6.1 source-constraints 0.0.5 diff --git a/aws-temporary-ingress-rule/test/stack-9.6-dependencies.txt b/aws-temporary-ingress-rule/test/stack-9.6-dependencies.txt index 5d5dc4cb..e8ea1c92 100644 --- a/aws-temporary-ingress-rule/test/stack-9.6-dependencies.txt +++ b/aws-temporary-ingress-rule/test/stack-9.6-dependencies.txt @@ -131,7 +131,7 @@ integer-gmp 1.1 integer-logarithms 1.0.3.1 invariant 0.6.3 iproute 1.7.12 -kan-extensions 5.2.5 +kan-extensions 5.2.6 lambda-runtime 0.0.2 lens 5.2.3 libyaml 0.1.4 @@ -172,7 +172,7 @@ process 1.6.19.0 profunctors 5.6.2 random 1.2.1.2 refact 0.3.0.2 -reflection 2.1.7 +reflection 2.1.8 regex-base 0.94.0.2 regex-posix 0.96.0.1 resourcet 1.3.0 @@ -181,7 +181,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 socks 0.6.1 source-constraints 0.0.5 diff --git a/bounded/test/stack-9.6-dependencies.txt b/bounded/test/stack-9.6-dependencies.txt index 4f62f40d..0ca94a8f 100644 --- a/bounded/test/stack-9.6-dependencies.txt +++ b/bounded/test/stack-9.6-dependencies.txt @@ -100,7 +100,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 should-not-typecheck 2.1.0 source-constraints 0.0.5 split 0.2.5 diff --git a/cbt/test/stack-9.6-dependencies.txt b/cbt/test/stack-9.6-dependencies.txt index 5bc8d2e8..0eef5bc0 100644 --- a/cbt/test/stack-9.6-dependencies.txt +++ b/cbt/test/stack-9.6-dependencies.txt @@ -113,7 +113,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 source-constraints 0.0.5 split 0.2.5 diff --git a/cli-utils/test/stack-9.6-dependencies.txt b/cli-utils/test/stack-9.6-dependencies.txt index 8372ac30..517069c1 100644 --- a/cli-utils/test/stack-9.6-dependencies.txt +++ b/cli-utils/test/stack-9.6-dependencies.txt @@ -85,7 +85,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 source-constraints 0.0.5 split 0.2.5 splitmix 0.1.0.5 diff --git a/conversions/test/stack-9.6-dependencies.txt b/conversions/test/stack-9.6-dependencies.txt index 0284422c..151cb780 100644 --- a/conversions/test/stack-9.6-dependencies.txt +++ b/conversions/test/stack-9.6-dependencies.txt @@ -97,7 +97,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 source-constraints 0.0.5 split 0.2.5 splitmix 0.1.0.5 diff --git a/dbt/test/stack-9.6-dependencies.txt b/dbt/test/stack-9.6-dependencies.txt index a06e176d..fee7d3f1 100644 --- a/dbt/test/stack-9.6-dependencies.txt +++ b/dbt/test/stack-9.6-dependencies.txt @@ -110,7 +110,7 @@ integer-gmp 1.1 integer-logarithms 1.0.3.1 invariant 0.6.3 isomorphism-class 0.1.0.12 -kan-extensions 5.2.5 +kan-extensions 5.2.6 keys 3.12.3 libyaml 0.1.4 libyaml-clib 0.2.5 @@ -159,7 +159,7 @@ safe-exceptions 0.1.7.4 scientific 0.3.7.0 selective 0.7.0.1 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 source-constraints 0.0.5 split 0.2.5 diff --git a/devtools/test/stack-9.6-dependencies.txt b/devtools/test/stack-9.6-dependencies.txt index a65936e8..8defca34 100644 --- a/devtools/test/stack-9.6-dependencies.txt +++ b/devtools/test/stack-9.6-dependencies.txt @@ -84,7 +84,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 source-constraints 0.0.5 split 0.2.5 splitmix 0.1.0.5 diff --git a/http-mclient/test/stack-9.6-dependencies.txt b/http-mclient/test/stack-9.6-dependencies.txt index cae27eb6..3671730e 100644 --- a/http-mclient/test/stack-9.6-dependencies.txt +++ b/http-mclient/test/stack-9.6-dependencies.txt @@ -133,7 +133,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 simple-sendfile 0.2.32 source-constraints 0.0.5 split 0.2.5 diff --git a/lambda-alb/test/stack-9.6-dependencies.txt b/lambda-alb/test/stack-9.6-dependencies.txt index 5b1b3c2d..fd973443 100644 --- a/lambda-alb/test/stack-9.6-dependencies.txt +++ b/lambda-alb/test/stack-9.6-dependencies.txt @@ -116,7 +116,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 source-constraints 0.0.5 split 0.2.5 diff --git a/lambda-runtime/test/stack-9.6-dependencies.txt b/lambda-runtime/test/stack-9.6-dependencies.txt index 39421e36..3d07aa4b 100644 --- a/lambda-runtime/test/stack-9.6-dependencies.txt +++ b/lambda-runtime/test/stack-9.6-dependencies.txt @@ -115,7 +115,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 source-constraints 0.0.5 split 0.2.5 diff --git a/lht/test/stack-9.6-dependencies.txt b/lht/test/stack-9.6-dependencies.txt index d982f4f6..54bff595 100644 --- a/lht/test/stack-9.6-dependencies.txt +++ b/lht/test/stack-9.6-dependencies.txt @@ -118,7 +118,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 source-constraints 0.0.5 split 0.2.5 diff --git a/mio-amazonka/test/stack-9.6-dependencies.txt b/mio-amazonka/test/stack-9.6-dependencies.txt index 80c7758b..73bd57fe 100644 --- a/mio-amazonka/test/stack-9.6-dependencies.txt +++ b/mio-amazonka/test/stack-9.6-dependencies.txt @@ -104,7 +104,7 @@ integer-gmp 1.1 integer-logarithms 1.0.3.1 invariant 0.6.3 iproute 1.7.12 -kan-extensions 5.2.5 +kan-extensions 5.2.6 lens 5.2.3 libyaml 0.1.4 libyaml-clib 0.2.5 @@ -135,7 +135,7 @@ process 1.6.19.0 profunctors 5.6.2 random 1.2.1.2 refact 0.3.0.2 -reflection 2.1.7 +reflection 2.1.8 regex-base 0.94.0.2 regex-posix 0.96.0.1 resourcet 1.3.0 @@ -144,7 +144,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 socks 0.6.1 source-constraints 0.0.5 diff --git a/mio-core/test/stack-9.6-dependencies.txt b/mio-core/test/stack-9.6-dependencies.txt index b3a2aa0f..6266ebc9 100644 --- a/mio-core/test/stack-9.6-dependencies.txt +++ b/mio-core/test/stack-9.6-dependencies.txt @@ -85,7 +85,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 source-constraints 0.0.5 split 0.2.5 splitmix 0.1.0.5 diff --git a/mio-log/test/stack-9.6-dependencies.txt b/mio-log/test/stack-9.6-dependencies.txt index d64122ad..45ac3344 100644 --- a/mio-log/test/stack-9.6-dependencies.txt +++ b/mio-log/test/stack-9.6-dependencies.txt @@ -99,7 +99,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 source-constraints 0.0.5 split 0.2.5 splitmix 0.1.0.5 diff --git a/oauth/test/stack-9.6-dependencies.txt b/oauth/test/stack-9.6-dependencies.txt index 36bd4ecc..7ca5c8ef 100644 --- a/oauth/test/stack-9.6-dependencies.txt +++ b/oauth/test/stack-9.6-dependencies.txt @@ -116,7 +116,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 source-constraints 0.0.5 split 0.2.5 splitmix 0.1.0.5 diff --git a/openapi/test/stack-9.6-dependencies.txt b/openapi/test/stack-9.6-dependencies.txt index ad255698..de3871b8 100644 --- a/openapi/test/stack-9.6-dependencies.txt +++ b/openapi/test/stack-9.6-dependencies.txt @@ -103,7 +103,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 source-constraints 0.0.5 split 0.2.5 diff --git a/pgt/test/stack-9.6-dependencies.txt b/pgt/test/stack-9.6-dependencies.txt index f7cb7a04..213572d4 100644 --- a/pgt/test/stack-9.6-dependencies.txt +++ b/pgt/test/stack-9.6-dependencies.txt @@ -110,7 +110,7 @@ integer-gmp 1.1 integer-logarithms 1.0.3.1 invariant 0.6.3 isomorphism-class 0.1.0.12 -kan-extensions 5.2.5 +kan-extensions 5.2.6 keys 3.12.3 libyaml 0.1.4 libyaml-clib 0.2.5 @@ -163,7 +163,7 @@ safe-exceptions 0.1.7.4 scientific 0.3.7.0 selective 0.7.0.1 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 source-constraints 0.0.5 split 0.2.5 diff --git a/stack-9.6.yaml b/stack-9.6.yaml index 5a005264..dcd9528a 100644 --- a/stack-9.6.yaml +++ b/stack-9.6.yaml @@ -1,5 +1,4 @@ -resolver: lts-22.20 -compiler: ghc-9.6.5 +resolver: lts-22.21 extra-deps: - amazonka-secretsmanager-2.0@sha256:de4b8b2e1d5d0743dda1eb85c8be96897ab6ccf5aa62494d2d6318d869a49d42,4473 - mprelude diff --git a/stack-9.6.yaml.lock b/stack-9.6.yaml.lock index 5ea68d13..7ab4d428 100644 --- a/stack-9.6.yaml.lock +++ b/stack-9.6.yaml.lock @@ -130,7 +130,7 @@ packages: url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz snapshots: - completed: - sha256: 4a0e5e187fbef423f9c60072bfb1dd56f2a01a07a2667eb1469bd79073cfceaf - size: 713340 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/20.yaml - original: lts-22.20 + sha256: b146f371d1a90abbd2aeae1da10f776951046be50eae55a6fe93548a74fcc0dd + size: 713338 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/21.yaml + original: lts-22.21 diff --git a/stack-deploy/test/stack-9.6-dependencies.txt b/stack-deploy/test/stack-9.6-dependencies.txt index 9a77fca3..ca941a9b 100644 --- a/stack-deploy/test/stack-9.6-dependencies.txt +++ b/stack-deploy/test/stack-9.6-dependencies.txt @@ -124,7 +124,7 @@ integer-gmp 1.1 integer-logarithms 1.0.3.1 invariant 0.6.3 iproute 1.7.12 -kan-extensions 5.2.5 +kan-extensions 5.2.6 lambda-runtime 0.0.2 lens 5.2.3 libyaml 0.1.4 @@ -162,7 +162,7 @@ process 1.6.19.0 profunctors 5.6.2 random 1.2.1.2 refact 0.3.0.2 -reflection 2.1.7 +reflection 2.1.8 regex-base 0.94.0.2 regex-posix 0.96.0.1 resourcet 1.3.0 @@ -171,7 +171,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 socks 0.6.1 source-constraints 0.0.5 diff --git a/xray/test/stack-9.6-dependencies.txt b/xray/test/stack-9.6-dependencies.txt index 3ad03643..838e8754 100644 --- a/xray/test/stack-9.6-dependencies.txt +++ b/xray/test/stack-9.6-dependencies.txt @@ -105,7 +105,7 @@ rts 1.0.2 safe-exceptions 0.1.7.4 scientific 0.3.7.0 semialign 1.3 -semigroupoids 6.0.0.1 +semigroupoids 6.0.1 semigroups 0.20 source-constraints 0.0.5 split 0.2.5 From 606d42e566f4335866d6e43f6ea97cf2f088e838 Mon Sep 17 00:00:00 2001 From: Markus Schirp Date: Thu, 16 May 2024 01:17:55 +0000 Subject: [PATCH 2/2] [stack-deploy] Change to compact template encoding * Only use the "non pretty" encoding when interacting with the CF API. * Reduces the chance we have to go through S3 inthe first place. * Also reduces the chance the template is "at all" to big for CF. --- stack-deploy/src/StackDeploy/Operation.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stack-deploy/src/StackDeploy/Operation.hs b/stack-deploy/src/StackDeploy/Operation.hs index b69e5df0..6a8548b9 100644 --- a/stack-deploy/src/StackDeploy/Operation.hs +++ b/stack-deploy/src/StackDeploy/Operation.hs @@ -21,6 +21,7 @@ import qualified Amazonka.CloudFormation.DeleteStack as CF import qualified Amazonka.CloudFormation.Types as CF import qualified Amazonka.CloudFormation.UpdateStack as CF import qualified Amazonka.S3.Types as S3 +import qualified Data.Aeson as JSON import qualified Data.ByteString as BS import qualified Data.ByteString.Lazy as LBS import qualified Data.Map.Strict as Map @@ -257,7 +258,7 @@ prepareOperation maxBytes = 51200 templateBody = Text.decodeUtf8 templateBodyBS - templateBodyBS = LBS.toStrict $ StackDeploy.stratosphereTemplateEncodePretty namedTemplate.template + templateBodyBS = LBS.toStrict $ JSON.encode namedTemplate.template setText :: (Applicative f, ToText b) => Lens' a (f Text) -> b -> a -> a setText field value = set field (pure $ convert value)