Chapter 16 updated

Author: tib

Chapter 16/myProject/.github/workflows/deploy.yml

@@ -0,0 +1,40 @@
+name: deploy
+on:
+  push:
+    branches:
+      - master
+jobs:
+  deploy_aws_ecs:
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: AWS - Config
+        run: |
+          aws configure set aws_access_key_id ${{ secrets.AWS_KEY }} --profile default
+          aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET }} --profile default
+          aws configure set region ${{ secrets.AWS_REGION }} --profile default
+
+      - name: AWS ECR - Login
+        run: |
+          LOGIN_COMMAND=$(aws ecr get-login --no-include-email --region ${{ secrets.AWS_REGION }})
+          $LOGIN_COMMAND
+
+      - name: Docker - Build image
+        run: |
+          docker build \
+            --build-arg AWS_RDS_HOST=${{secrets.AWS_RDS_HOST}} \
+            --build-arg AWS_RDS_USER=${{secrets.AWS_RDS_USER}} \
+            --build-arg AWS_RDS_PASS=${{secrets.AWS_RDS_PASS}} \
+            --build-arg AWS_RDS_DB=${{secrets.AWS_RDS_DB}} \
+            --build-arg AWS_S3_REGION=${{secrets.AWS_S3_REGION}} \
+            --build-arg AWS_S3_BUCKET=${{secrets.AWS_S3_BUCKET}} \
+            -t "${{ secrets.AWS_ECR_IMAGE_NAME }}:latest" -f Dockerfile .
+
+      - name: Docker - Push image
+        run: docker push "${{ secrets.AWS_ECR_IMAGE_NAME }}:latest"
+
+      - name: AWS ECS - deploy image
+        run: |
+          aws ecs update-service --cluster "${{ secrets.AWS_ECS_CLUSTER }}" \
+            --service "${{ secrets.AWS_ECS_SERVICE }}" \
+            --force-new-deployment

Chapter 16/myProject/.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: test
+on:
+- pull_request
+
+jobs:
+
+  test_on_macos:
+    runs-on: macos-latest
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
+    steps:
+    - uses: actions/checkout@v2
+    - run: xcrun swift test --enable-test-discovery --sanitize=thread
+
+  test_on_ubuntu_xenial:
+    container:
+      image: vapor/swift:5.2.2-xenial-ci
+    runs-on: ubuntu-latest
+    steps:
+    - run: apt update -y; apt install -y libsqlite3-dev
+    - uses: actions/checkout@v2
+    - run: swift test --enable-test-discovery --sanitize=thread
+
+  test_on_ubuntu_bionic:
+    container:
+      image: vapor/swift:5.2.2-bionic-ci
+    runs-on: ubuntu-latest
+    steps:
+    - run: apt update -y; apt install -y libsqlite3-dev
+    - uses: actions/checkout@v2
+    - run: swift test --enable-test-discovery --sanitize=thread

Chapter 16/myProject/Dockerfile

@@ -0,0 +1,36 @@
+# Build image
+FROM swift:5.3-focal as build
+
+RUN apt-get update -y \
+    && apt-get install -y libsqlite3-dev
+
+WORKDIR /build
+
+COPY . .
+
+RUN for f in Sources/App/Modules/*; do \
+    m=$(basename $f); \
+    cp -r "${f}/Views/" "Resources/Views/${m}" 2>/dev/null; \
+    done; \
+    exit 0;
+
+RUN swift build \
+    --enable-test-discovery \
+    -c release \
+    -Xswiftc -g
+
+
+# Run image
+FROM swift:5.3-focal-slim
+
+RUN useradd --user-group --create-home --home-dir /app vapor
+
+WORKDIR /app
+
+COPY --from=build --chown=vapor:vapor /build/.build/release /app
+COPY --from=build --chown=vapor:vapor /build/Public /app/Public
+COPY --from=build --chown=vapor:vapor /build/Resources /app/Resources
+
+USER vapor
+ENTRYPOINT ["./Run"]
+CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]

Chapter 16/myProject/Package.swift

@@ -13,10 +13,12 @@ let package = Package(
         .package(url: "https://github.com/vapor/leaf-kit", from: "1.0.0-tau"),
         .package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
         .package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.0.0"),
+        .package(url: "https://github.com/vapor/fluent-postgres-driver", from: "2.0.0"),
         .package(url: "https://github.com/vapor/jwt", from: "4.0.0"),
         .package(name: "apns", url: "https://github.com/vapor/apns", from: "1.0.0"),
         .package(url: "https://github.com/binarybirds/liquid", from: "1.1.0"),
         .package(url: "https://github.com/binarybirds/liquid-local-driver", from: "1.1.0"),
+        .package(url: "https://github.com/binarybirds/liquid-aws-s3-driver", from: "1.0.5"),
         .package(url: "https://github.com/lukaskubanek/LoremSwiftum", from: "2.2.1"),
         .package(name: "MyProjectApi", path: "../MyProjectApi"),
         .package(url: "https://github.com/binarybirds/spec", from: "1.1.0"),
@@ -30,8 +32,10 @@ let package = Package(
             .product(name: "Leaf", package: "leaf"),
             .product(name: "Fluent", package: "fluent"),
             .product(name: "FluentSQLiteDriver", package: "fluent-sqlite-driver"),
+            .product(name: "FluentPostgresDriver", package: "fluent-postgres-driver"),
             .product(name: "Liquid", package: "liquid"),
             .product(name: "LiquidLocalDriver", package: "liquid-local-driver"),
+            .product(name: "LiquidAwsS3Driver", package: "liquid-aws-s3-driver"),
             .product(name: "JWT", package: "jwt"),
             .product(name: "APNS", package: "apns"),
             .product(name: "LoremSwiftum", package: "LoremSwiftum"),

Chapter 16/myProject/Sources/App/Extensions/Environment+App.swift

@@ -27,4 +27,20 @@ extension Environment {
         /// com.example.ios.app
         static let topic = Environment.get("APNS_TOPIC")!
     }
+
+    struct Postgres {
+        /// postgres://myuser:mypass@localhost:5432/mydb
+        //static let connectionUrl = Environment.get("PSQL_CONNECTION_URL")!
+
+        static let host = Environment.get("DB_HOST")!
+        static let port = Int(Environment.get("DB_PORT")!)!
+        static let user = Environment.get("DB_USER")!
+        static let pass = Environment.get("DB_PASS")!
+        static let database = Environment.get("DB_NAME")!
+    }
+
+    struct Aws {
+        static let region = Environment.get("AWS_REGION")!
+        static let bucket = Environment.get("AWS_BUCKET")!
+    }
 }

Chapter 16/myProject/Sources/App/Modules/Utility/Commands/UtilityDatabaseTransferCommand.swift

@@ -0,0 +1,76 @@
+import Vapor
+import Fluent
+import FluentSQLiteDriver
+
+final class UtilityDatabaseTransferCommand: Command {
+    
+    static let name = "database-transfer"
+
+    struct Signature: CommandSignature { }
+        
+    let help = "Transfer database models from one db to another"
+    
+    func run(using context: CommandContext, signature: Signature) throws {
+        let app = context.application
+        
+        app.databases.use(.sqlite(.file("db.sqlite")), as: .sqlite, isDefault: false)
+
+        let frames = ["⠋","⠙","⠹","⠸","⠼","⠴","⠦","⠧","⠇","⠏"]
+            .map { $0 + " Transfer in progress..."}
+        
+        let loadingBar = context.console.customActivity(frames: frames)
+
+        
+        
+        let sourceDb = app.databases.database(.sqlite,
+                                              logger: app.logger,
+                                              on: app.eventLoopGroup.next())!
+
+        let targetDb = app.databases.database(.psql,
+                                              logger: app.logger,
+                                              on: app.eventLoopGroup.next())!
+        
+        loadingBar.start()
+        
+        do {
+            // wipe target db first
+            try UserModel.query(on: targetDb).delete().wait()
+            try BlogPostModel.query(on: targetDb).delete().wait()
+            try BlogCategoryModel.query(on: targetDb).delete().wait()
+
+            // create existing items on the target db
+            try UserModel.query(on: sourceDb).all()
+            .flatMap {
+                $0.map { UserModel(id: $0.id, email: $0.email, password: $0.password) }
+                    .create(on: targetDb)
+            }
+            .wait()
+            
+            try BlogCategoryModel.query(on: sourceDb).all().flatMap {
+                $0.map { BlogCategoryModel(id: $0.id, title: $0.title) }
+                    .create(on: targetDb)
+            }.wait()
+            
+            try BlogPostModel.query(on: sourceDb)
+                .with(\.$category)
+                .all()
+                .flatMap {
+                    $0.map { BlogPostModel(id: $0.id,
+                                       title: $0.title,
+                                       slug: $0.slug,
+                                       image: $0.image,
+                                       excerpt: $0.excerpt,
+                                       date: $0.date,
+                                       content: $0.content,
+                                       categoryId: $0.category.id!) }
+                    .create(on: targetDb)
+            }.wait()
+
+            loadingBar.succeed()
+        }
+        catch {
+            loadingBar.fail()
+            context.console.error("Error: \(error.localizedDescription)")
+        }
+    }
+}

Chapter 16/myProject/Sources/App/Modules/Utility/UtilityCommandGroup.swift

@@ -14,6 +14,7 @@ struct UtilityCommandGroup: CommandGroup {
 
         commands = [
             UtilityFileTransferCommand.name: UtilityFileTransferCommand(),
+            UtilityDatabaseTransferCommand.name: UtilityDatabaseTransferCommand(),
         ]
     }
 }

Chapter 16/myProject/Sources/App/configure.swift

@@ -2,9 +2,9 @@ import Vapor
 import Leaf
 import LeafFoundation
 import Fluent
-import FluentSQLiteDriver
+import FluentPostgresDriver
 import Liquid
-import LiquidLocalDriver
+import LiquidAwsS3Driver
 import JWT
 import APNS
 @_exported import ContentApi
@@ -37,12 +37,17 @@ public func configure(_ app: Application) throws {
             environment: .sandbox
         )
 
-    app.databases.use(.sqlite(.file("db.sqlite")), as: .sqlite)
-    
+    let configuration = PostgresConfiguration(hostname: Environment.Postgres.host,
+                                              port: Environment.Postgres.port,
+                                              username: Environment.Postgres.user,
+                                              password: Environment.Postgres.pass,
+                                              database: Environment.Postgres.database)
+    app.databases.use(.postgres(configuration: configuration), as: .psql)
+
     app.routes.defaultMaxBodySize = "10mb"
-    app.fileStorages.use(.local(publicUrl: "http://localhost:8080",
-                                publicPath: app.directory.publicDirectory,
-                                workDirectory: "assets"), as: .local)
+
+    app.fileStorages.use(.awsS3(region: .init(rawValue: Environment.Aws.region),
+                                bucket: .init(stringLiteral: Environment.Aws.bucket)), as: .awsS3)
 
     app.sessions.use(.fluent)
     app.migrations.add(SessionRecord.migration)

Chapter 16/myProject/Tests/AppTests/AppTestCase.swift

@@ -3,6 +3,10 @@ import XCTVapor
 import XCTLeafKit
 import Leaf
 import Fluent
+import FluentSQLiteDriver
+import Liquid
+import LiquidLocalDriver
+//...
 
 extension XCTApplicationTester {
     @discardableResult public func test<T>(
@@ -25,8 +29,16 @@ open class AppTestCase: LeafKitTestCase {
 
         try configure(app)
         app.databases.reinitialize()
+
         app.databases.use(.sqlite(.memory), as: .sqlite)
         app.databases.default(to: .sqlite)
+
+        app.fileStorages.reinitialize()
+        app.fileStorages.use(.local(publicUrl: "http://localhost:8080",
+                                    publicPath: app.directory.publicDirectory,
+                                    workDirectory: "assets"), as: .local)
+        app.fileStorages.default(to: .local)
+
         try app.autoMigrate().wait()
         return app
     }

Chapter 16/myProject/docker-compose.yml

@@ -0,0 +1,37 @@
+version: '3.7'
+
+volumes:
+  db_data:
+
+x-shared_environment: &shared_environment
+  LOG_LEVEL: ${LOG_LEVEL:-debug}
+  DB_HOST: db
+  DB_NAME: mydb
+  DB_USER: myuser
+  DB_PASS: mypass
+
+services:
+
+  app:
+    image: my-project:latest
+    build:
+      context: .
+    environment:
+      <<: *shared_environment
+    depends_on:
+      - db
+    ports:
+      - '8080:8080'
+
+  db:
+    image: postgres:13.0-alpine
+    volumes:
+      - db_data:/var/lib/postgresql/data/pgdata
+    environment:
+      PGDATA: /var/lib/postgresql/data/pgdata
+      POSTGRES_USER: myuser
+      POSTGRES_PASSWORD: mypass
+      POSTGRES_DB: mydb
+    ports:
+      - '5432:5432'
+