Merge pull request #75 from silinternational/develop

Release 2.3.2 -- increase log retention

Author: briskt

.github/workflows/test-deploy-publish.yml

@@ -2,6 +2,9 @@ name: Test, Deploy, Publish
 
 on:
   push:
+    branches: ["**"]
+    paths-ignore:
+    - 'terraform/**'
 
 jobs:
   tests:
@@ -17,7 +20,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Test
-        run: docker-compose -f actions-services.yml run --rm test ./scripts/test.sh
+        run: docker compose -f actions-services.yml run --rm test ./scripts/test.sh
 
   deploy:
     name: Deploy to AWS Lambda
@@ -41,7 +44,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Deploy
-        run: docker-compose -f actions-services.yml run --rm app ./scripts/deploy.sh
+        run: docker compose -f actions-services.yml run --rm app ./scripts/deploy.sh
 
   build-and-publish:
     name: Build and Publish

Dockerfile

@@ -1,16 +1,17 @@
 FROM golang:1.18
 
-RUN curl -o- -L https://slss.io/install | VERSION=3.7.5 bash && \
+RUN curl -o- -L --proto "=https" https://slss.io/install | VERSION=3.7.5 bash && \
   mv $HOME/.serverless/bin/serverless /usr/local/bin && \
   ln -s /usr/local/bin/serverless /usr/local/bin/sls
 
 WORKDIR /src
 
-RUN curl -sSfL https://raw.githubusercontent.com/cosmtrek/air/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
+RUN curl -sSfL --proto "=https" https://raw.githubusercontent.com/cosmtrek/air/master/install.sh | \
+    sh -s -- -b $(go env GOPATH)/bin
 
 COPY ./ .
 RUN go get ./...
 
 EXPOSE 8080
 
-CMD ["air"]
+CMD ["air"]

Makefile

@@ -2,21 +2,21 @@ demo: proxy ui app dbinit
 	./local_data.sh
 
 proxy:
-	docker-compose up -d proxy
+	docker compose up -d proxy
 
 ui:
-	docker-compose up -d ui
+	docker compose up -d ui
 
 app:
-	docker-compose kill app
-	docker-compose rm -f app
-	docker-compose up -d app
+	docker compose kill app
+	docker compose rm -f app
+	docker compose up -d app
 
 test: clean dbinit
-	docker-compose run --rm app go test ./...
+	docker compose run --rm app go test ./...
 
 db:
-	docker-compose up -d dynamo
+	docker compose up -d dynamo
 
 dbinit: db wait createwebauthntable createapikeytable
 
@@ -55,5 +55,5 @@ showwebauth:
 		--region localhost
 
 clean:
-	docker-compose kill
-	docker-compose rm -f
+	docker compose kill
+	docker compose rm -f

actions-services.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   test:
     build: .

aws.env.encrypted

@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
   proxy:
     image: silintl/traefik-https-proxy

docker-compose.yml

@@ -7,7 +7,7 @@ provider:
   runtime: provided.al2
   timeout: 5 # API Gateway invoked functions are limited to 30 seconds
   versionFunctions: false
-  logRetentionInDays: 14
+  logRetentionInDays: 60
   apiGateway:
     shouldStartNameWithService: true
 

serverless.yml

@@ -9,10 +9,9 @@ locals {
 */
 module "serverless-user" {
   source  = "silinternational/serverless-user/aws"
-  version = "0.3.2"
+  version = "0.4.2"
 
   app_name           = "${var.app_name}-${var.app_env}"
-  aws_region         = var.aws_region
   aws_region_policy  = "*"
   enable_api_gateway = true
   extra_policies     = var.extra_policies