Merge pull request #23 from Frankie0702111/feature/queue

Add queue, db migrations, proto and api. fix past unit tests. update the env files.
Frankie0702111 · Sep 4, 2024 · 51b0f1a · 51b0f1a
2 parents a15a432 + 0d9078a
commit 51b0f1a
Show file tree

Hide file tree

Showing 43 changed files with 1,670 additions and 295 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -16,11 +16,11 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
 
-    - name: Install kubectl
-      uses: azure/setup-kubectl@v4
-      with:
-         version: 'v1.30.3'
-      id: install
+    # - name: Install kubectl
+    #   uses: azure/setup-kubectl@v4
+    #   with:
+    #      version: 'v1.30.3'
+    #   id: install
 
     - name: Get custom info
       id: custome-var
@@ -31,49 +31,49 @@ jobs:
         echo "build-time=$(TZ=Asia/Taipei date +'%Y-%m-%dT%H:%M:%S%z')" >> $GITHUB_OUTPUT
         echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
 
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      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: Configure AWS credentials
+    #   uses: aws-actions/configure-aws-credentials@v1
+    #   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: Login to Amazon ECR
+    #   id: login-ecr
+    #   uses: aws-actions/amazon-ecr-login@v2
 
-    - name: Load secrets and save to app.env
-      run: aws secretsmanager get-secret-value --secret-id go-todolist-grpc --query SecretString --output text | jq -r 'to_entries|map("\(.key)=\(.value)")|.[]' > app.env
+    # - name: Load secrets and save to app.env
+    #   run: aws secretsmanager get-secret-value --secret-id go-todolist-grpc --query SecretString --output text | jq -r 'to_entries|map("\(.key)=\(.value)")|.[]' > app.env
 
-    - name: Build, tag, and push docker image to Amazon ECR
-      id: build-image
-      env:
-        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-        ECR_REPOSITORY: go-todolist-grpc
-        IMAGE_TAG: ${{ github.sha }}
-        BUILD_VERSION: ${{ steps.custome-var.outputs.tag-name }}
-        COMMIT_HASH: ${{ steps.custome-var.outputs.short-sha }}
-        BUILD_TIME: ${{ steps.custome-var.outputs.build-time }}
-        BRANCH: ${{ steps.custome-var.outputs.branch }}
-      run: |
-        docker build \
-          --build-arg BUILD_VERSION="$BUILD_VERSION" \
-          --build-arg COMMIT_HASH="$COMMIT_HASH" \
-          --build-arg BUILD_TIME="$BUILD_TIME" \
-          --build-arg BRANCH="$BRANCH" \
-          -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
-        docker push -a $ECR_REGISTRY/$ECR_REPOSITORY
-        echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$BUILD_VERSION" >> $GITHUB_OUTPUT
+    # - name: Build, tag, and push docker image to Amazon ECR
+    #   id: build-image
+    #   env:
+    #     ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+    #     ECR_REPOSITORY: go-todolist-grpc
+    #     IMAGE_TAG: ${{ github.sha }}
+    #     BUILD_VERSION: ${{ steps.custome-var.outputs.tag-name }}
+    #     COMMIT_HASH: ${{ steps.custome-var.outputs.short-sha }}
+    #     BUILD_TIME: ${{ steps.custome-var.outputs.build-time }}
+    #     BRANCH: ${{ steps.custome-var.outputs.branch }}
+    #   run: |
+    #     docker build \
+    #       --build-arg BUILD_VERSION="$BUILD_VERSION" \
+    #       --build-arg COMMIT_HASH="$COMMIT_HASH" \
+    #       --build-arg BUILD_TIME="$BUILD_TIME" \
+    #       --build-arg BRANCH="$BRANCH" \
+    #       -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
+    #     docker push -a $ECR_REGISTRY/$ECR_REPOSITORY
+    #     echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$BUILD_VERSION" >> $GITHUB_OUTPUT
 
-    - name: Update kube config
-      run: aws eks update-kubeconfig --name go-todolist-grpc-eks --region ap-northeast-1
+    # - name: Update kube config
+    #   run: aws eks update-kubeconfig --name go-todolist-grpc-eks --region ap-northeast-1
 
-    - name: Deploy image to Amazon EKS
-      run: |
-        kubectl apply -f eks/aws-auth.yaml
-        kubectl apply -f eks/deployment.yaml
-        kubectl apply -f eks/service.yaml
-        kubectl apply -f eks/issuer.yaml
-        kubectl apply -f eks/ingress-nginx.yaml
-        kubectl apply -f eks/ingress-http.yaml
-        kubectl apply -f eks/ingress-grpc.yaml
+    # - name: Deploy image to Amazon EKS
+    #   run: |
+    #     kubectl apply -f eks/aws-auth.yaml
+    #     kubectl apply -f eks/deployment.yaml
+    #     kubectl apply -f eks/service.yaml
+    #     kubectl apply -f eks/issuer.yaml
+    #     kubectl apply -f eks/ingress-nginx.yaml
+    #     kubectl apply -f eks/ingress-http.yaml
+    #     kubectl apply -f eks/ingress-grpc.yaml
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ DOCKER = docker compose exec server
 DOCKER_HOST=db
 TEST_DB=test_db
 YMD = _$$(date +'%Y%m%d')
-number?=3
+number ?= $(shell ls -1 ./internal/migrations/*.up.sql 2>/dev/null | wc -l)
 table :=
 LOG_DIRS := internal/pkg/db/target internal/service/target
 
@@ -27,10 +27,18 @@ migrate-create:
 
 # make migrate-up number=x
 migrate-up:
-		$(DOCKER) migrate -path ./internal/migrations -database "$(DB)://$(DB_USER):$(DB_PASS)@$(DB_HOST):$(DB_PORT)/$(DB_NAME)?sslmode=verify-full&sslrootcert=./internal/config/certs/rds-ca-2019-root.pem" up $(number)
+		$(DOCKER) migrate -path ./internal/migrations -database "$(DB)://$(DB_USER):$(DB_PASS)@$(DB_HOST):$(DB_PORT)/$(DB_NAME)?sslmode=disable" up $(number)
 
 # make migrate-down number=x
 migrate-down:
+		$(DOCKER) migrate -path ./internal/migrations -database "$(DB)://$(DB_USER):$(DB_PASS)@$(DB_HOST):$(DB_PORT)/$(DB_NAME)?sslmode=disable" down $(number)
+
+# make migrate-aws-up number=x
+migrate-aws-up:
+		$(DOCKER) migrate -path ./internal/migrations -database "$(DB)://$(DB_USER):$(DB_PASS)@$(DB_HOST):$(DB_PORT)/$(DB_NAME)?sslmode=verify-full&sslrootcert=./internal/config/certs/rds-ca-2019-root.pem" up $(number)
+
+# make migrate-aws-down number=x
+migrate-aws-down:
 		$(DOCKER) migrate -path ./internal/migrations -database "$(DB)://$(DB_USER):$(DB_PASS)@$(DB_HOST):$(DB_PORT)/$(DB_NAME)?sslmode=verify-full&sslrootcert=./internal/config/certs/rds-ca-2019-root.pem" down $(number)
 
 # make migrate-test-up number=x
@@ -63,6 +71,7 @@ go-test:
 	go test -v internal/pkg/util/jwt_test.go -json > ./target/log/jwt_test$(YMD).log; \
 	go test -v internal/pkg/util/random_test.go -json > ./target/log/random_test$(YMD).log; \
 	go test -v internal/pkg/util/th_test.go -json > ./target/log/th_test$(YMD).log; \
+	go test -v internal/pkg/util/util_test.go -json > ./target/log/util_test$(YMD).log; \
 	go test -v internal/model/mod_user_test.go -json > ./target/log/mod_user_test$(YMD).log; \
 	go test -v internal/service/s_user_test.go -json > ./target/log/s_user_test$(YMD).log; \
 	go test -v internal/model/mod_category_test.go -json > ./target/log/mod_category_test$(YMD).log; \

diff --git a/api/pb/model.pb.go b/api/pb/model.pb.go