Move some settings to env vars instead of config

.gitignore

@@ -1,3 +1,7 @@
+.env
+.env.just
+local.just
+
 *.sfc
 appsettings.Development.json
 kube/

ALttPRandomizer/Model/MysterySettings.cs

@@ -48,7 +48,7 @@
 
         public RandomizableWeights<DungeonItemLocations> Compasses { get; set; } = new();
 
-        public RandomizableWeights<ShowLoot> ShowLoot { get; set; } = new();
+        public RandomizableWeights<ShowLootMap> ShowLootMap { get; set; } = new();
 
         public RandomizableWeights<ShowLootHud> ShowLootHud { get; set; } = new();
 

ALttPRandomizer/Model/SeedSettings.cs

@@ -51,6 +51,10 @@
         [IgnoreSetting(Apr2025)]
         public GanonItem GanonItem { get; set; } = GanonItem.Silver;
 
+        [NoSettingName]
+        [IgnoreSetting(Apr2025)]
+        public RequireGanonItem RequireGanonItem { get; set; } = RequireGanonItem.SilverlessAllowed;
+
         [SettingName("shuffle")]
         [ForbiddenSetting([Apr2025], EntranceShuffle.Swapped)]
         public EntranceShuffle EntranceShuffle { get; set; } = EntranceShuffle.Vanilla;
@@ -102,10 +106,10 @@
 
         [SettingName("showloot")]
         [IgnoreSetting(Apr2025)]
-        public ShowLoot ShowLoot { get; set; } = ShowLoot.Never;
+        public ShowLootMap ShowLootMap { get; set; } = ShowLootMap.Never;
 
         [SettingName("loothud")]
-        [IgnoreSetting(Apr2025, Base)]
+        [IgnoreSetting(Apr2025)]
         public ShowLootHud ShowLootHud { get; set; } = ShowLootHud.Never;
 
         [SettingName("showmap")]
@@ -168,7 +172,7 @@
         public TrapDoorMode TrapDoorMode { get; set; } = TrapDoorMode.Some;
 
         [SettingName("extra_keys")]
-        [IgnoreSetting(Apr2025, Base)]
+        [IgnoreSetting(Apr2025)]
         public ExtraKeysMode ExtraKeys { get; set; } = ExtraKeysMode.None;
 
         [NoSettingName]
@@ -327,6 +331,11 @@
         None,
     }
 
+    public enum RequireGanonItem {
+        SilverlessAllowed,
+        [AdditionalSetting("--require_ganon_item")] SpecialItemRequired,
+    }
+
     public enum EntranceShuffle {
         Vanilla,
         Full,
@@ -421,7 +430,7 @@
         Wild,
     }
 
-    public enum ShowLoot {
+    public enum ShowLootMap {
         Never,
         Presence,
         Compass,
@@ -433,6 +442,7 @@
         Presence,
         Value,
         [SettingName("dungeon_value")] DungeonValue,
+        [SettingName("cave_value")] CaveValue,
     }
 
     public enum ShowMap {
@@ -471,6 +481,7 @@
     public enum BombSettings {
         Normal,
         [AdditionalSetting("--bombbag")] BombBagRequired,
+        [AddStartingItems("Bombs_(10)")] Starting,
     }
 
     public enum BookSettings {

ALttPRandomizer/Program.cs

@@ -6,6 +6,7 @@
     using ALttPRandomizer.Randomizers;
     using ALttPRandomizer.Service;
     using ALttPRandomizer.Settings;
+    using global::Azure.Core;
     using global::Azure.Identity;
     using global::Azure.Storage.Blobs;
     using Microsoft.AspNetCore.Builder;
@@ -14,12 +15,13 @@
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
     using Serilog;
+    using System;
+    using System.Linq;
     using System.Text.Json;
     using YamlDotNet.Serialization;
     using YamlDotNet.Serialization.NamingConventions;
 
-    internal class Program
+    internal class Program {
-    {
         static void Main(string[] args)
         {
             var builder = WebApplication.CreateBuilder(args);
@@ -44,9 +46,15 @@
             var settings = provider.GetRequiredService<IOptionsMonitor<ServiceOptions>>().CurrentValue!;
             var logger = provider.GetRequiredService<ILogger<Program>>();
 
+            var allowedCors = settings.AllowedCors;
+            var envCors = Environment.GetEnvironmentVariable("ALLOWED_CORS");
+            if (envCors != null) {
+                allowedCors = allowedCors.Concat(envCors.Split()).ToList();
+            }
+
             builder.Services.AddCors(options => {
                 options.AddPolicy("AllowDomains", policy => {
-                    policy.WithOrigins(settings.AllowedCors.ToArray()).AllowAnyMethod().AllowAnyHeader();
+                    policy.WithOrigins(allowedCors.ToArray()).AllowAnyMethod().AllowAnyHeader();
                 });
             });
 
@@ -75,13 +83,22 @@
                 options.OperationFilter<DefaultMysterySettingsFilter>();
             });
 
+            TokenCredential? token = null;
+
+            if (Environment.GetEnvironmentVariable("USE_SAMI") == "true") {
+                token = new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned);
+            } else {
                 var options = new DefaultAzureCredentialOptions();
 
-            if (settings.AzureSettings.ClientId != null) {
+                var clientId = Environment.GetEnvironmentVariable("CLIENT_ID");
-                options.ManagedIdentityClientId = new(settings.AzureSettings.ClientId);
+
+                if (clientId != null) {
+                    options.ManagedIdentityClientId = new(clientId);
+                }
+
+                token = new DefaultAzureCredential(options);
             }
 
-            var token = new DefaultAzureCredential(options);
             var seedClient = new BlobContainerClient(settings.AzureSettings.BlobstoreEndpoint, token);
 
             builder.Services.AddSingleton(seedClient);

ALttPRandomizer/Randomizers/BaseRandomizer.cs

@@ -18,6 +18,8 @@
         public const int MULTI_TRIES = 100;
         public const int SINGLE_TRIES = 5;
 
+        private static readonly Random random = new();
+
         public BaseRandomizer(
                 AzureStorage azureStorage,
                 CommonSettingsProcessor settingsProcessor,
@@ -64,10 +66,20 @@
                 args.Add("--shuffletavern");
             }
 
+            if (settings.Randomizer == RandomizerInstance.Beta) {
+                if (random.NextDouble() < 0.25) {
+                    args.Add("--orange_potion");
+                }
+            }
+
             if (settings.DoorShuffle == DoorShuffle.Vanilla) {
                 settings.DoorTypeMode = DoorTypeMode.Original;
             }
 
+            if (settings.GanonItem == GanonItem.None) {
+                settings.RequireGanonItem = RequireGanonItem.SilverlessAllowed;
+            }
+
             foreach (var arg in SettingsProcessor.GetSettings(settings.Randomizer, settings)) {
                 args.Add(arg);
             }

ALttPRandomizer/SeedController.cs

@@ -111,6 +111,12 @@
             }
         }
 
+        [Route("/healthcheck")]
+        [HttpGet]
+        public StatusCodeResult GetHealthCheck() {
+            return Ok();
+        }
+
         private ObjectResult ResolveResult(IDictionary<string, object> result) {
             if (result.TryGetValue("status", out var responseCode)) {
                 if (responseCode is int code) {

ALttPRandomizer/appsettings.Docker.json

@@ -5,10 +5,9 @@
     "allowedCors": [
       "https://new.alttpr.gwaa.kiwi",
       "https://api.alttpr.gwaa.kiwi",
-      "http://localhost:8082"
+      "http://localhost:8082",
     ],
     "azureSettings": {
-      "clientId": "a48d5ae1-fa0a-4e33-9586-18c0eca0a28c",
       "blobstoreEndpoint": "https://alttprstorage.blob.core.windows.net/seeds"
     },
     "generators": {

justfile

@@ -0,0 +1,25 @@
+set dotenv-filename := ".env.just"
+
+import? "local.just"
+
+[private]
+@list:
+  just --list --list-submodules --unsorted
+
+# Build docker image
+[group("docker")]
+[arg("TAG", long="tag", short="t")]
+build VERSION="latest" TAG=env("DOCKER_TAG"):
+  DOCKER_BUILDKIT=1 docker build . --progress=plain -t {{TAG}}:{{VERSION}}
+
+# Run docker image
+[group("docker")]
+[arg("TAG", long="tag", short="t")]
+run VERSION="latest" TAG=env("DOCKER_TAG"): (build VERSION TAG)
+  docker run -p 5000:8080 {{TAG}}:{{VERSION}}
+
+# Push docker image to registry
+[group("docker")]
+[arg("TAG", long="tag", short="t")]
+push VERSION="latest" TAG=env("DOCKER_TAG"): (build VERSION TAG)
+  docker push {{TAG}}:{{VERSION}}