Merge pull request #188 from zaanposni/zaanposni/187-configsetup

refactored config setup and fixed test env

.github/workflows/docker_compose.yml

@@ -8,20 +8,14 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build the stack
       run: |
-        sudo chmod +x bootstrap_init.sh
-        ./bootstrap_init.sh
-        docker-compose build
-        docker-compose up -d
+        docker-compose --env-file ./tests/.docker.env up -d
   SmokeTest:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Build the stack
       run: |
-        sudo chmod +x bootstrap_init.sh
-        ./bootstrap_init.sh
-        docker-compose build
-        docker-compose up -d
+        docker-compose --env-file ./tests/.docker.env up -d
     - name: Test
       run: |
         cd tests

.github/workflows/docker_compose_master.yml

@@ -11,20 +11,15 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build the stack
       run: |
-        sudo chmod +x bootstrap_init.sh
-        ./bootstrap_init.sh
-        docker-compose build
-        docker-compose up -d
+        docker-compose --env-file ./tests/.docker.env up -d
+
   SmokeTest:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Build the stack
       run: |
-        sudo chmod +x bootstrap_init.sh
-        ./bootstrap_init.sh
-        docker-compose build
-        docker-compose up -d
+        docker-compose --env-file ./tests/.docker.env up -d
     - name: Test
       run: |
         cd tests

backend/Dockerfile

@@ -1,8 +1,35 @@
 FROM python:3 as init
+
+ARG MYSQL_DATABASE
+ENV MYSQL_DATABASE $MYSQL_DATABASE
+
+ARG MYSQL_USER
+ENV MYSQL_USER $MYSQL_USER
+
+ARG MYSQL_PASSWORD
+ENV MYSQL_PASSWORD $MYSQL_PASSWORD
+
+ARG MYSQL_PORT
+ENV MYSQL_PORT $MYSQL_PORT
+
+ARG MYSQL_HOST
+ENV MYSQL_HOST $MYSQL_HOST
+
+ARG DISCORD_BOT_TOKEN
+ENV DISCORD_BOT_TOKEN $DISCORD_BOT_TOKEN
+
+ARG DISCORD_OAUTH_CLIENT_ID
+ENV DISCORD_OAUTH_CLIENT_ID $DISCORD_OAUTH_CLIENT_ID
+
+ARG DISCORD_OAUTH_CLIENT_SECRET
+ENV DISCORD_OAUTH_CLIENT_SECRET $DISCORD_OAUTH_CLIENT_SECRET
+
+ARG DISCORD_SITE_ADMINS
+ENV DISCORD_SITE_ADMINS $DISCORD_SITE_ADMINS
+
 WORKDIR /app
 
 COPY setup_app.py .
-COPY config.json .
 COPY ./masz/appsettings.json ./masz/
 
 RUN python3 setup_app.py

backend/masz/Controllers/api/v1/ModCaseController.cs

@@ -224,6 +224,10 @@ public async Task<IActionResult> PutSpecificItem([FromRoute] string guildid, [Fr
                     logger.LogInformation($"{HttpContext.Request.Method} {HttpContext.Request.Path} | 400 Cannot create cases for bots.");
                     return BadRequest("Cannot create cases for bots.");
                 }
+                if (config.Value.SiteAdminDiscordUserIds.Contains(currentReportedUser.Id)) {
+                    logger.LogInformation($"{HttpContext.Request.Method} {HttpContext.Request.Path} | 400 Cannot create cases for site admins.");
+                    return BadRequest("Cannot create cases for site admins.");
+                }
                 modCase.Username = currentReportedUser.Username;  // update to new username
 
                 var currentReportedMember = await discord.FetchMemberInfo(guildid, modCase.UserId);
@@ -316,6 +320,10 @@ public async Task<IActionResult> CreateItem([FromRoute] string guildid, [FromBod
                 logger.LogInformation($"{HttpContext.Request.Method} {HttpContext.Request.Path} | 400 Cannot create cases for bots.");
                 return BadRequest("Cannot create cases for bots.");
             }
+            if (config.Value.SiteAdminDiscordUserIds.Contains(currentReportedUser.Id)) {
+                logger.LogInformation($"{HttpContext.Request.Method} {HttpContext.Request.Path} | 400 Cannot create cases for site admins.");
+                return BadRequest("Cannot create cases for site admins.");
+            }
 
             newModCase.Username = currentReportedUser.Username;
 

backend/setup_app.py

@@ -8,11 +8,7 @@ def random_pass(pass_length=200):
     random.seed = (os.urandom(1024))
     return ''.join(random.choice(chars) for i in range(pass_length))
 
-with open("./config.json", "r") as fh:
-    config = json.load(fh)
-
-db = config["mysql_database"]
-CNC_STRING = f"Server={db['host']};Port={db['port']};Database={db['database']};Uid={db['user']};Pwd={db['pass']};"
+CNC_STRING = f'Server={os.getenv("MYSQL_HOST")};Port={os.getenv("MYSQL_PORT")};Database={os.getenv("MYSQL_DATABASE")};Uid={os.getenv("MYSQL_USER")};Pwd={os.getenv("MYSQL_PASSWORD")};'
 
 PATH = os.path.join("masz", "appsettings.json")
 
@@ -21,13 +17,13 @@ def random_pass(pass_length=200):
 
 data["ConnectionStrings"]["DefaultConnection"] = CNC_STRING
 data["AppSettings"]["Token"] = random_pass(200)
-data["InternalConfig"]["DiscordBotToken"] = config["discord"]["bot_token"]
-data["InternalConfig"]["DiscordClientId"] = config["discord"]["oauth_client_id"]
-data["InternalConfig"]["DiscordClientSecret"] = config["discord"]["oauth_client_secret"]
-data["InternalConfig"]["ServiceHostName"] = config["meta"]["service_name"]
-data["InternalConfig"]["ServiceBaseUrl"] = config["meta"]["service_base_url"]
+data["InternalConfig"]["DiscordBotToken"] = os.getenv("DISCORD_BOT_TOKEN")
+data["InternalConfig"]["DiscordClientId"] = os.getenv("DISCORD_OAUTH_CLIENT_ID")
+data["InternalConfig"]["DiscordClientSecret"] = os.getenv("DISCORD_OAUTH_CLIENT_SECRET")
+data["InternalConfig"]["ServiceHostName"] = os.getenv("META_SERVICE_NAME")
+data["InternalConfig"]["ServiceBaseUrl"] = os.getenv("META_SERVICE_BASE_URL")
 try:
-    data["InternalConfig"]["SiteAdminDiscordUserIds"] = list(config["discord"]["site_admins"])
+    data["InternalConfig"]["SiteAdminDiscordUserIds"] = list(os.getenv("DISCORD_SITE_ADMINS").split(","))
 except:
     data["InternalConfig"]["SiteAdminDiscordUserIds"] = []
 

discordbot/Dockerfile

@@ -6,7 +6,6 @@ COPY requirements.txt .
 
 RUN python -m pip install -r requirements.txt
 
-COPY config.json .
 COPY src/ .
 
-ENTRYPOINT [ "python", "main.py" ]
+ENTRYPOINT [ "python", "-u", "main.py" ]

discordbot/src/main.py

@@ -5,8 +5,6 @@
 from discord.errors import LoginFailure
 from discord.ext import commands
 
-from utils.config import cfg
-
 prefix = os.getenv("BOT_PREFIX", "$")
 if prefix.strip() == "":
     prefix = "$"
@@ -50,7 +48,7 @@ async def on_ready():
 
     # discord related
     # ================================================
-    activity = cfg.get("meta", dict()).get("service_base_url", "github.com/zaanposni/discord-masz")
+    activity = os.getenv("META_SERVICE_BASE_URL", "github.com/zaanposni/discord-masz")
     if activity:
         game = discord.Game(name=activity)
         await client.change_presence(activity=game)
@@ -59,7 +57,7 @@ async def on_ready():
 
 def start_bot():
     try:
-        token = cfg.get("discord", dict())["bot_token"]
+        token = os.getenv("DISCORD_BOT_TOKEN")
     except KeyError:
         print(f"========================")
         print(f"'discord'.'bot_token' not found in config files!")