handler: deploy swagger and update terraform

Author: nmattia

.circleci/config.yml

@@ -39,10 +39,38 @@ jobs:
       - run:
           name: Nix build
           command: |
-            ls
-            pwd
             ./script/test
 
+      - run:
+          name: "Update Node.js and npm"
+          command: |
+            nix-env -f ./nix -iA nodejs-10_x
+
+      - run:
+          name: Install netlify-cli
+          command: |
+            npm install netlify-cli
+
+      - run: # TODO: shouldn't deploy to prod on every commit
+          name: Netlify deploy
+          command: |
+            echo "Branch:" "$CIRCLE_BRANCH"
+            echo "Repo:" "$CIRCLE_REPOSITORY_URL"
+            echo "PR:" "$CIRCLE_PULL_REQUEST"
+            if [ "$CIRCLE_BRANCH" == "master" ]; then
+                echo "Deploying to production"
+                ./node_modules/netlify-cli/bin/run deploy \
+                    --dir=$(nix-build -A swaggerUi --no-link) \
+                    --message="$CIRCLE_SHA1" --prod
+            elif [ -n "$CIRCLE_PULL_REQUEST" ]; then
+                echo "One time deploy for PR $CIRCLE_PR_NUMBER"
+                ./node_modules/netlify-cli/bin/run deploy \
+                    --dir=$(nix-build -A swaggerUi --no-link) \
+                    --message="$CIRCLE_SHA1"
+            else
+                echo "Not deploying"
+            fi
+
 workflows:
   version: 2
   build:

infra/default.nix

@@ -16,6 +16,12 @@ rec
 
   publicKey = builtins.readFile ./public.cer;
 
+  swaggerUi = pkgs.runCommand "swagger-ui" {}
+  ''
+    mkdir -p $out
+    ${handler}/bin/swagger $out
+  '';
+
   googleResp = { "key1" = publicKey ; };
 
   apiDir = pkgs.writeTextFile

infra/handler/app/Swagger.hs

@@ -10,14 +10,17 @@ import qualified Network.Wai.Handler.Warp as Warp
 import qualified Servant as Servant
 import qualified Servant.Swagger as Servant
 import qualified Servant.Swagger.UI.Extended as Servant
+import System.Environment (getArgs)
 
 type SwaggerAPI = Servant.SwaggerSchemaUI "swagger-ui" "swagger.json"
 
 swaggerApi :: Proxy SwaggerAPI
 swaggerApi = Proxy
 
 main :: IO ()
-main = serveSwagger
+main = do
+  [dir] <- getArgs
+  dumpSwagger dir
 
 swagger :: Swagger.Swagger
 swagger = Servant.toSwagger (Proxy :: Proxy DeckGo.Handler.SlidesAPI)

infra/lambda.tf

@@ -60,8 +60,9 @@ data "aws_iam_policy_document" "policy_for_lambda" {
     ]
 
     resources = [
-      "${aws_dynamodb_table.deckdeckgo-test-dynamodb-table.arn}",
+      "${aws_dynamodb_table.deckdeckgo-test-dynamodb-table-decks.arn}",
       "${aws_dynamodb_table.deckdeckgo-test-dynamodb-table-slides.arn}",
+      "${aws_dynamodb_table.deckdeckgo-test-dynamodb-table-users.arn}",
     ]
   }