Merge pull request #25 from magi-sche-org/develop

bump up dev -> main
magi-sche-org · Mar 3, 2024 · d599dc0 · d599dc0
2 parents 0076ca7 + 99b202a
commit d599dc0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1 +1,3 @@
 .git
+infra
+.github
diff --git a/.github/workflows/golangci.yaml b/.github/workflows/golangci.yaml
@@ -15,6 +15,6 @@ jobs:
         uses: reviewdog/action-golangci-lint@v2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          golangci_lint_flags: "--config=./.golangci.yml ./..."
+          golangci_lint_flags: "--config=./.golangci.yaml ./..."
           fail_on_error: true
           reporter: "github-pr-review"
diff --git a/infra/ecs/ecs-task-def.jsonnet b/infra/ecs/ecs-task-def.jsonnet
@@ -107,7 +107,7 @@
         {
           name: 'SMTP_USER',
           valueFrom: '{{ tfstate `output.api_server_ssm_arn` }}:smtp_user::',
-        }
+        },
         {
           name: 'SMTP_PASSWORD',
           valueFrom: '{{ tfstate `output.api_server_ssm_arn` }}:smtp_password::',

diff --git a/usecase/event.go b/usecase/event.go
@@ -183,7 +183,7 @@ func (eu *eventUsecase) CreateUserAnswer(ctx context.Context, eventId ulid.ULID,
 
 https://magi-sche.net/detail/` + idstr + `から確認できます。
 今後ともマジスケをよろしくお願いいたします。`
-			util.SendMail(*eu.cfg, event.ConfirmationEmail, title, body)
+			err = util.SendMail(*eu.cfg, event.ConfirmationEmail, title, body)
 			if err != nil {
 				log.Printf("failed to send confirmation email: %v", err)
 				// return entity.UserEventAnswer{}, apperror.NewUnknownError(fmt.Errorf("failed to send confirmation email: %w", err), nil)
-Original file line number
+Diff line change
@@ -1 +1,3 @@
     .git
+    infra
+    .github