nuget reorganization

src/Scanner/StellaOps.Scanner.Sbomer.BuildXPlugin/Program.cs

@@ -8,12 +8,16 @@ using System.Threading.Tasks;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text.Json.Serialization;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using StellaOps.Cryptography;
 using StellaOps.Scanner.Sbomer.BuildXPlugin.Attestation;
 using StellaOps.Scanner.Sbomer.BuildXPlugin.Cas;
 using StellaOps.Scanner.Sbomer.BuildXPlugin.Descriptor;
 using StellaOps.Scanner.Sbomer.BuildXPlugin.Manifest;
 using StellaOps.Scanner.Sbomer.BuildXPlugin.Surface;
+using StellaOps.Scanner.Surface.Env;
 
 namespace StellaOps.Scanner.Sbomer.BuildXPlugin;
 
@@ -294,6 +298,8 @@ internal static class Program
         string casRoot,
         string generatorVersion)
     {
+        var surfaceEnv = TryResolveSurfaceEnvironment();
+
         var layerFragmentsPath = GetOption(args, "--surface-layer-fragments")
             ?? Environment.GetEnvironmentVariable("STELLAOPS_SURFACE_LAYER_FRAGMENTS");
         var entryTraceGraphPath = GetOption(args, "--surface-entrytrace-graph")
@@ -310,15 +316,18 @@ internal static class Program
 
         var cacheRoot = GetOption(args, "--surface-cache-root")
             ?? Environment.GetEnvironmentVariable("STELLAOPS_SURFACE_CACHE_ROOT")
+            ?? surfaceEnv?.CacheRoot.FullName
             ?? casRoot;
         var bucket = GetOption(args, "--surface-bucket")
             ?? Environment.GetEnvironmentVariable("STELLAOPS_SURFACE_BUCKET")
+            ?? surfaceEnv?.SurfaceFsBucket
             ?? SurfaceCasLayout.DefaultBucket;
         var rootPrefix = GetOption(args, "--surface-root-prefix")
             ?? Environment.GetEnvironmentVariable("STELLAOPS_SURFACE_ROOT_PREFIX")
             ?? SurfaceCasLayout.DefaultRootPrefix;
         var tenant = GetOption(args, "--surface-tenant")
             ?? Environment.GetEnvironmentVariable("STELLAOPS_SURFACE_TENANT")
+            ?? surfaceEnv?.Tenant
             ?? "default";
         var component = GetOption(args, "--surface-component")
             ?? Environment.GetEnvironmentVariable("STELLAOPS_SURFACE_COMPONENT")
@@ -362,6 +371,36 @@ internal static class Program
             ManifestOutputPath: manifestOutput);
     }
 
+    private static SurfaceEnvironmentSettings? TryResolveSurfaceEnvironment()
+    {
+        try
+        {
+            var configuration = new ConfigurationBuilder()
+                .AddEnvironmentVariables()
+                .Build();
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IConfiguration>(configuration);
+            services.AddLogging();
+
+            using var provider = services.BuildServiceProvider();
+            var env = SurfaceEnvironmentFactory.Create(provider, options =>
+            {
+                options.ComponentName = "Scanner.BuildXPlugin";
+                options.AddPrefix("SCANNER");
+                options.AddPrefix("SURFACE");
+                options.RequireSurfaceEndpoint = false;
+            });
+
+            return env.Settings;
+        }
+        catch
+        {
+            // Silent fallback to legacy options/env without breaking plugin execution.
+            return null;
+        }
+    }
+
     private static string? GetOption(string[] args, string optionName)
     {
         for (var i = 0; i < args.Length; i++)