ECS Deployment

.aws/task-definition.json

@@ -1,62 +1,49 @@
 {
-  "taskDefinitionArn": "arn:aws:ecs:us-east-1:798380260115:task-definition/PickemLiveStats:4",
   "containerDefinitions": [
     {
       "name": "pickem",
-      "image": "798380260115.dkr.ecr.us-east-1.amazonaws.com/pickemlivestats",
-      "cpu": 0,
+      "image": "798380260115.dkr.ecr.us-east-1.amazonaws.com/pickemlivestats:5de4b0690a72a92f6ba5d2420a2936209f695509",
+      "cpu": 256,
+      "memory": 512,
       "portMappings": [],
       "essential": true,
       "environment": [],
-      "environmentFiles": [
+      "environmentFiles": [],
+      "mountPoints": [],
+      "volumesFrom": [],
+      "secrets": [
         {
-          "value": "arn:aws:s3:::pickem-environment-bucket/dev-livestats.env",
-          "type": "s3"
+          "name": "DATABASE_URL",
+          "valueFrom": "arn:aws:secretsmanager:us-east-1:798380260115:secret:PickemLiveStats/dev-BfVBxS:DATABASE_URL::"
+        },
+        {
+          "name": "REDIS_URL",
+          "valueFrom": "arn:aws:secretsmanager:us-east-1:798380260115:secret:PickemLiveStats/dev-BfVBxS:REDIS_URL::"
         }
       ],
-      "mountPoints": [],
-      "volumesFrom": [],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-create-group": "true",
+          "awslogs-group": "pickem-livestats-dev",
+          "awslogs-region": "us-east-1",
+          "awslogs-stream-prefix": "dev-stats"
+        },
+        "secretOptions": []
+      },
       "systemControls": []
     }
   ],
   "family": "PickemLiveStats",
+  "taskRoleArn": "arn:aws:iam::798380260115:role/ecsTaskExecutionRole",
   "executionRoleArn": "arn:aws:iam::798380260115:role/ecsTaskExecutionRole",
   "networkMode": "awsvpc",
-  "revision": 4,
   "volumes": [],
-  "status": "ACTIVE",
-  "requiresAttributes": [
-    {
-      "name": "com.amazonaws.ecs.capability.ecr-auth"
-    },
-    {
-      "name": "ecs.capability.env-files.s3"
-    },
-    {
-      "name": "ecs.capability.execution-role-ecr-pull"
-    },
-    {
-      "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
-    },
-    {
-      "name": "ecs.capability.task-eni"
-    }
-  ],
   "placementConstraints": [],
-  "compatibilities": [
-    "EC2",
-    "FARGATE"
-  ],
   "requiresCompatibilities": [
     "FARGATE"
   ],
   "cpu": "256",
   "memory": "512",
-  "runtimePlatform": {
-    "cpuArchitecture": "X86_64",
-    "operatingSystemFamily": "LINUX"
-  },
-  "registeredAt": "2024-03-06T22:12:24.591Z",
-  "registeredBy": "arn:aws:iam::798380260115:root",
   "tags": []
 }

.github/workflows/deploy_dev.yml

@@ -0,0 +1,62 @@
+name: Deploy to ECR
+run-name: Run ${{ github.run_id }} deploying to ECR
+on:
+  push:
+    branches:
+      - dev
+
+env:
+  AWS_REGION: us-east-1
+  AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
+  CONTAINER_NAME: "pickem"
+  ECS_CLUSTER: PickemLiveStats-Dev
+
+
+jobs:
+  deploy:
+    name: Deploy to ECR
+    runs-on: ubuntu-latest
+    environment: development
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Build, tag, and push image to Amazon ECR
+        id: build-image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
+          IMAGE_TAG: ${{ github.sha }}
+        run: |
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
+
+      - name: Fill new image ID in Amazon ECS task definition
+        id: fill-task-def
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
+        with:
+          task-definition: .aws/task-definition.json
+          container-name: ${{ env.CONTAINER_NAME }}
+          image: ${{ steps.build-image.outputs.image }}
+
+      - name: Deploy to Amazon ECS
+        uses: airfordable/ecs-deploy-task-definition-to-scheduled-task@v2.0.0
+        with:
+          cluster: ${{ env.ECS_CLUSTER }}
+          task-definition: ${{ steps.fill-task-def.outputs.task-definition }}

.github/workflows/deploy.yml → .github/workflows/deploy_prod.yml

@@ -1,3 +1,4 @@
+
 name: Deploy to ECR
 run-name: Run ${{ github.run_id }} deploying to ECR
 on:
@@ -10,10 +11,9 @@ env:
   AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  ECR_REPO: ${{ secrets.ECR_REPO }}
+  ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
   CONTAINER_NAME: "pickem"
-  ECS_SERVICE: PickemLiveStats
-  ECS_CLUSTER: PickemLiveStats-Dev
+  ECS_CLUSTER: PickemLiveStats-Prod
 
 
 jobs:
@@ -41,7 +41,7 @@ jobs:
         id: build-image
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-          ECR_REPOSITORY: ${{ secrets.ECR_REPO }}
+          ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
           docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
@@ -55,14 +55,3 @@ jobs:
           task-definition: .aws/task-definition.json
           container-name: my-container
           image: ${{ steps.build-image.outputs.image }}
-
-
-      - name: Deploy ECS task definition
-        uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-        with:
-          task-definition: ${{ steps.fill-task-def.outputs.new-task-definition }}
-          service: my-service
-          cluster: my-cluster
-          wait-for-service-stability: true
-
-

Dockerfile

@@ -14,4 +14,6 @@ COPY . .
 RUN go build -v -o /usr/local/bin/main ./...
 ENV DATABASE_URL=$DATABASE_URL
 ENV REDIS_URL=$REDIS_URL
+ENV TZ="America/New_York"
+RUN ls -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 CMD ["main"]

batch.go

@@ -0,0 +1,81 @@
+package main
+
+import (
+	"context"
+	"log/slog"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func BatchUpdateTime(client *DatabaseClient) {
+	rows, err := client.db.Query(
+		context.Background(),
+		`SELECT id, "homeTeam_id", "awayTeam_id", date FROM games WHERE date = $1`,
+		time.Now().Format("2006-01-02"))
+	if err != nil {
+		slog.Error("Could not obtain games for today...")
+		slog.Error(err.Error())
+		os.Exit(1)
+	}
+
+	for rows.Next() {
+		var game Game
+		err := rows.Scan(&game.ID, &game.HomeTeam_ID, &game.AwayTeam_ID, &game.Date)
+		if err != nil {
+			slog.Error("Could not scan game...")
+			slog.Error(err.Error())
+			os.Exit(1)
+		}
+		gameData, err := getGameData(game.ID)
+		if err != nil {
+			slog.Error("Could not obtain game data...")
+			slog.Error(err.Error())
+			os.Exit(1)
+		}
+		gameStats, err := getGameStats(gameData)
+		if err != nil {
+			slog.Error("Could not obtain game stats...")
+			slog.Error(err.Error())
+			os.Exit(1)
+		}
+		datetime, err := unwrap(gameStats, "datetime")
+		if err != nil {
+			slog.Error("Could not unwrap datetime...")
+			slog.Error(err.Error())
+			os.Exit(1)
+		}
+		startTime, err := time.Parse("2006-01-02T15:04:05Z", datetime["dateTime"].(string))
+		if err != nil {
+			slog.Error("Could not parse start time...")
+			slog.Error(err.Error())
+			os.Exit(1)
+		}
+
+		client.db.Exec(context.Background(),
+			`UPDATE games SET date = CURRENT_DATE, "startTimeUTC" = $2 WHERE id = $3`, startTime, game.ID)
+	}
+	rows.Close()
+}
+
+func BatchResolveJobs(client *DatabaseClient) {
+	keys, err := client.redisClient.Keys(context.Background(), "game:*").Result()
+	if err != nil {
+		return
+	}
+
+	for _, key := range keys {
+		gameID, err := strconv.Atoi(strings.Split(key, ":")[1])
+		if err != nil {
+			slog.Error("Could not convert key to integer...")
+			slog.Error(err.Error())
+			os.Exit(1)
+		}
+
+		// Update all items once upon startup, if scheduled then expires within 24 hours.
+		handleGameStats(gameID, databaseClient)
+
+	}
+
+}

database.go

@@ -8,6 +8,7 @@ import (
 	"log/slog"
 	"os"
 	"sync"
+	"time"
 )
 
 type DatabaseClient struct {
@@ -18,11 +19,11 @@ type DatabaseClient struct {
 }
 
 func NewDatabaseClient() *DatabaseClient {
-	dotEnvErr := godotenv.Load()
-	if dotEnvErr != nil {
-		slog.Error("Error loading .env file, exiting")
-		os.Exit(1)
-	}
+	godotenv.Load()
+	//if dotEnvErr != nil {
+	//	slog.Error("Error loading .env file, exiting")
+	//	os.Exit(1)
+	//}
 
 	// Connect to database
 	connStr := os.Getenv("DATABASE_URL")
@@ -52,3 +53,11 @@ func NewDatabaseClient() *DatabaseClient {
 	}
 
 }
+
+func UpdateTime(client *DatabaseClient, gameID int, newStartTime time.Time) {
+	localTime := newStartTime.In(time.Local)
+	_, err := client.db.Exec(context.Background(), `UPDATE games SET date = $1, "startTimeUTC" = $2 WHERE id = $3`, localTime, newStartTime, gameID)
+	if err != nil {
+		slog.Error(err.Error())
+	}
+}