Merge pull request #513 from tktcorporation/0/chore/sentry-aws-sdk

sentry の導入

.devcontainer/devcontainer.json

@@ -1,9 +1,11 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// /~https://github.com/microsoft/vscode-dev-containers/tree/v0.165.1/containers/docker-existing-docker-compose
-// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: /~https://github.com/devcontainers/templates/tree/main/src/docker-in-docker
 {
 	"name": "discord-tts-bot",
 
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/base:bullseye",
+
 	"customizations": {
 		"vscode": {
 			"extensions": [
@@ -19,22 +21,27 @@
 		}
 	},
 	"features": {
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {
+			"version": "latest",
+			"enableNonRootDocker": "true",
+			"moby": "true"
+		},
+		// github-cli
+		"ghcr.io/devcontainers/features/github-cli:1": {},
 		"ghcr.io/devcontainers/features/rust:1": {}
-	}
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
+	},
 
-	// Uncomment the next line if you want start specific services in your Docker Compose config.
-	// "runServices": [],
+	"runArgs": ["--env-file",".devcontainer/devcontainer.env"]
 
-	// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
-	// "shutdownAction": "none",
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
 
-	// "postCreateCommand": "apt-get update && apt-get install -y git",
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "docker --version",
 
-	// Uncomment the next line to run commands after the container is created - for example installing curl.
-	// "onCreateCommand": "make install",
+	// Configure tool-specific properties.
+	// "customizations": {},
 
-	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
-	// "remoteUser": "vscode"
-}
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.github/workflows/deploy-to-fly.yml

@@ -26,5 +26,6 @@ jobs:
           AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
           AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
           AWS_REGION=${{ secrets.AWS_REGION }} \
-          DISCORD_CMD_PREFIX=${{ secrets.DISCORD_CMD_PREFIX_MUSIC }}
+          DISCORD_CMD_PREFIX=${{ secrets.DISCORD_CMD_PREFIX_MUSIC }} \
+          SENTRY_DSN=${{ secrets.SENTRY_DSN }}
       # - run: flyctl deploy --remote-only

.github/workflows/deploy-tts-to-fly.yml

@@ -28,4 +28,5 @@ jobs:
           AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
           AWS_REGION=${{ secrets.AWS_REGION }} \
           DISCORD_CMD_PREFIX=${{ secrets.DISCORD_CMD_PREFIX_TTS_II }}
+          SENTRY_DSN=${{ secrets.SENTRY_DSN }}
       - run: flyctl deploy --remote-only -c fly-tts.toml

.github/workflows/deploy-tts2-to-fly.yml

@@ -27,5 +27,6 @@ jobs:
           AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
           AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
           AWS_REGION=${{ secrets.AWS_REGION }} \
-          DISCORD_CMD_PREFIX=${{ secrets.DISCORD_CMD_PREFIX }}
+          DISCORD_CMD_PREFIX=${{ secrets.DISCORD_CMD_PREFIX }} \
+          SENTRY_DSN=${{ secrets.SENTRY_DSN }}
       - run: flyctl deploy --remote-only -c fly-tts-2.toml

.gitignore

@@ -12,6 +12,8 @@ target/
 .env
 tmp/
 
+*.env
+
 # Sound data
 /sounds/*
 !/sounds/shabeko_dayo.wav