fix: upgrade aws-sdk from 2.1437.0 to 2.1692.0

Snyk has created this PR to upgrade aws-sdk from 2.1437.0 to 2.1692.0.

See this package in yarn:
aws-sdk

See this project in Snyk:
https://app.snyk.io/org/gableroux/project/0093f2b4-3941-4f68-a9bb-165f87558780?utm_source=github&utm_medium=referral&page=upgrade-pr

dist/default-build-script/Assets/Editor/UnityBuilderAction/Builder.cs

@@ -74,7 +74,7 @@ namespace UnityBuilderAction
         }
         catch (Exception e)
         {
-          Debug.LogError($"Failed to run default addressables build:\n{e}");
+          Debug.LogError("Failed to run default addressables build:\n" + e);
         }
       }
 

dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/AndroidSettings.cs

@@ -56,17 +56,17 @@ namespace UnityBuilderAction.Input
           case "androidStudioProject":
             EditorUserBuildSettings.exportAsGoogleAndroidProject = true;
             if (buildAppBundle != null)
-              buildAppBundle.SetValue(null, false);
+              buildAppBundle.SetValue(null, false, null);
             break;
           case "androidAppBundle":
             EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
             if (buildAppBundle != null)
-              buildAppBundle.SetValue(null, true);
+              buildAppBundle.SetValue(null, true, null);
             break;
           case "androidPackage":
             EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
             if (buildAppBundle != null)
-              buildAppBundle.SetValue(null, false);
+              buildAppBundle.SetValue(null, false, null);
             break;
         }
       }

dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/ArgumentsParser.cs

@@ -28,7 +28,7 @@ namespace UnityBuilderAction.Input
       }
 
       if (!Enum.IsDefined(typeof(BuildTarget), buildTarget)) {
-        Console.WriteLine($"{buildTarget} is not a defined {nameof(BuildTarget)}");
+        Console.WriteLine(buildTarget + " is not a defined " + typeof(BuildTarget).Name);
         EditorApplication.Exit(121);
       }
 
@@ -41,10 +41,10 @@ namespace UnityBuilderAction.Input
       const string defaultCustomBuildName = "TestBuild";
       string customBuildName;
       if (!validatedOptions.TryGetValue("customBuildName", out customBuildName)) {
-        Console.WriteLine($"Missing argument -customBuildName, defaulting to {defaultCustomBuildName}.");
+        Console.WriteLine("Missing argument -customBuildName, defaulting to" + defaultCustomBuildName);
         validatedOptions.Add("customBuildName", defaultCustomBuildName);
       } else if (customBuildName == "") {
-        Console.WriteLine($"Invalid argument -customBuildName, defaulting to {defaultCustomBuildName}.");
+        Console.WriteLine("Invalid argument -customBuildName, defaulting to" + defaultCustomBuildName);
         validatedOptions.Add("customBuildName", defaultCustomBuildName);
       }
 
@@ -57,11 +57,11 @@ namespace UnityBuilderAction.Input
       string[] args = Environment.GetCommandLineArgs();
 
       Console.WriteLine(
-        $"{EOL}" +
-        $"###########################{EOL}" +
-        $"#    Parsing settings     #{EOL}" +
-        $"###########################{EOL}" +
-        $"{EOL}"
+        EOL +
+        "###########################" + EOL +
+        "#    Parsing settings     #" + EOL +
+        "###########################" + EOL +
+        EOL
       );
 
       // Extract flags with optional values
@@ -78,7 +78,7 @@ namespace UnityBuilderAction.Input
         string displayValue = secret ? "*HIDDEN*" : "\"" + value + "\"";
 
         // Assign
-        Console.WriteLine($"Found flag \"{flag}\" with value {displayValue}.");
+        Console.WriteLine("Found flag \"" + flag + "\" with value " + displayValue);
         providedArguments.Add(flag, value);
       }
     }

dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/CompileListener.cs

@@ -30,7 +30,7 @@ namespace UnityBuilderAction.Reporting
                     prefix = "error";
                     break;
             }
-            Console.WriteLine($"{Environment.NewLine}::{prefix} ::{condition}{Environment.NewLine}{stackTrace}");
+            Console.WriteLine(Environment.NewLine + "::" + prefix + "::" + condition + Environment.NewLine + stackTrace);
         }
     }
 }

dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/StdOutReporter.cs

@@ -11,16 +11,16 @@ namespace UnityBuilderAction.Reporting
     public static void ReportSummary(BuildSummary summary)
     {
       Console.WriteLine(
-        $"{EOL}" +
-        $"###########################{EOL}" +
-        $"#      Build results      #{EOL}" +
-        $"###########################{EOL}" +
-        $"{EOL}" +
-        $"Duration: {summary.totalTime.ToString()}{EOL}" +
-        $"Warnings: {summary.totalWarnings.ToString()}{EOL}" +
-        $"Errors: {summary.totalErrors.ToString()}{EOL}" +
-        $"Size: {summary.totalSize.ToString()} bytes{EOL}" +
-        $"{EOL}"
+        EOL +
+        "###########################" + EOL +
+        "#      Build results      #" + EOL +
+        "###########################" + EOL +
+        EOL +
+        "Duration: " + summary.totalTime.ToString() + EOL +
+        "Warnings: " + summary.totalWarnings.ToString() + EOL +
+        "Errors: " + summary.totalErrors.ToString() + EOL +
+        "Size: " + summary.totalSize.ToString() + " bytes" + EOL +
+        EOL
       );
     }
 

dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs

@@ -21,11 +21,11 @@ namespace UnityBuilderAction.Versioning
         version = GetSemanticCommitVersion();
         Console.WriteLine("Repository has a valid version tag.");
       } else {
-        version = $"0.0.{GetTotalNumberOfCommits()}";
+        version = "0.0." + GetTotalNumberOfCommits();
         Console.WriteLine("Repository does not have tags to base the version on.");
       }
 
-      Console.WriteLine($"Version is {version}");
+      Console.WriteLine("Version is " + version);
 
       return version;
     }

dist/index.js

@@ -6108,6 +6108,7 @@ class Docker {
             --volume "C:/ProgramData/Microsoft/VisualStudio":"C:/ProgramData/Microsoft/VisualStudio" \
             --volume "${actionFolder}/default-build-script":"c:/UnityBuilderAction" \
             --volume "${actionFolder}/platforms/windows":"c:/steps" \
+            --volume "${actionFolder}/unity-config":"C:/ProgramData/Unity/config" \
             --volume "${actionFolder}/BlankProject":"c:/BlankProject" \
             --cpus=${dockerCpuLimit} \
             --memory=${dockerMemoryLimit} \
@@ -7524,9 +7525,12 @@ const node_fs_1 = __importDefault(__nccwpck_require__(87561));
 class ValidateWindows {
     static validate(buildParameters) {
         ValidateWindows.validateWindowsPlatformRequirements(buildParameters.targetPlatform);
-        if (!(process.env.UNITY_EMAIL && process.env.UNITY_PASSWORD)) {
-            throw new Error(`Unity email and password must be set for Windows based builds to
-                       authenticate the license. Make sure to set them inside UNITY_EMAIL
+        const { unityLicensingServer } = buildParameters;
+        const hasLicensingCredentials = process.env.UNITY_EMAIL && process.env.UNITY_PASSWORD;
+        const hasValidLicensingStrategy = hasLicensingCredentials || unityLicensingServer;
+        if (!hasValidLicensingStrategy) {
+            throw new Error(`Unity email and password or alternatively a Unity licensing server url must be set for 
+                       Windows based builds to authenticate the license. Make sure to set them inside UNITY_EMAIL
                        and UNITY_PASSWORD in Github Secrets and pass them into the environment.`);
         }
     }
@@ -8006,7 +8010,17 @@ class Versioning {
      * identifies the current commit.
      */
     static async getVersionDescription() {
-        return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
+        const versionTags = (await this.git(['tag', '--list', '--merged', 'HEAD', '--sort=-creatordate']))
+            .split('\n')
+            .filter(tag => new RegExp(this.grepCompatibleInputVersionRegex).test(tag));
+        if (versionTags.length === 0) {
+            core.warning('No valid version tags found. Using fallback description.');
+            return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
+        }
+        const latestVersionTag = versionTags[0];
+        const commitsCount = (await this.git(['rev-list', `${latestVersionTag}..HEAD`, '--count'])).trim();
+        const commitHash = (await this.git(['rev-parse', '--short', 'HEAD'])).trim();
+        return `${latestVersionTag}-${commitsCount}-g${commitHash}`;
     }
     /**
      * Returns whether there are uncommitted changes that are not ignored.

dist/platforms/windows/activate.ps1

@@ -50,6 +50,30 @@ if ( ($null -ne ${env:UNITY_SERIAL}) -and ($null -ne ${env:UNITY_EMAIL}) -and ($
       Start-Sleep -Seconds 3
   }
 }
+elseif( ($null -ne ${env:UNITY_LICENSING_SERVER}))
+{
+    #
+    # Custom Unity License Server
+    #
+
+    Write-Output "Adding licensing server config"
+
+    $ACTIVATION_OUTPUT = Start-Process -FilePath "$Env:UNITY_PATH\Editor\Data\Resources\Licensing\Client\Unity.Licensing.Client.exe" `
+                                       -ArgumentList "--acquire-floating" `
+                                       -NoNewWindow `
+                                       -PassThru `
+                                       -Wait `
+                                       -RedirectStandardOutput "license.txt"
+
+    $PARSEDFILE = (Get-Content "license.txt" | Select-String -AllMatches -Pattern '\".*?\"' | ForEach-Object { $_.Matches.Value }) -replace '"'
+
+    $env:FLOATING_LICENSE = $PARSEDFILE[1]
+    $FLOATING_LICENSE_TIMEOUT = $PARSEDFILE[3]
+
+    Write-Output "Acquired floating license: ""$env:FLOATING_LICENSE"" with timeout $FLOATING_LICENSE_TIMEOUT"
+    # Store the exit code from the verify command
+    $ACTIVATION_EXIT_CODE = $ACTIVATION_OUTPUT.ExitCode
+}
 else
 {
     #

dist/platforms/windows/return_license.ps1

@@ -6,7 +6,16 @@ Write-Output "#      Return License     #"
 Write-Output "###########################"
 Write-Output ""
 
-if (($null -ne ${env:UNITY_SERIAL}) -and ($null -ne ${env:UNITY_EMAIL}) -and ($null -ne ${env:UNITY_PASSWORD}))
+if (($null -ne ${env:UNITY_LICENSING_SERVER}))
+{
+  Write-Output "Returning floating license: ""$env:FLOATING_LICENSE"""
+  Start-Process -FilePath "$Env:UNITY_PATH\Editor\Data\Resources\Licensing\Client\Unity.Licensing.Client.exe" `
+                -ArgumentList "--return-floating ""$env:FLOATING_LICENSE"" " `
+                -NoNewWindow `
+                -Wait
+}
+
+elseif (($null -ne ${env:UNITY_SERIAL}) -and ($null -ne ${env:UNITY_EMAIL}) -and ($null -ne ${env:UNITY_PASSWORD}))
 {
   #
   # SERIAL LICENSE MODE

dist/platforms/windows/set_gitcredential.ps1

@@ -5,12 +5,12 @@ else {
     Write-Host "GIT_PRIVATE_TOKEN is set configuring git credentials"
 
     git config --global credential.helper store
-    git config --global --replace-all "url.https://token:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "ssh://git@github.com/"
-    git config --global --add "url.https://token:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "git@github.com"
-    git config --global --add "url.https://token:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "https://github.com/"
+    git config --global --replace-all url."https://token:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "ssh://git@github.com/"
+    git config --global --add url."https://token:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "git@github.com"
+    git config --global --add url."https://token:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "https://github.com/"
 
-    git config --global "url.https://ssh:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "ssh://git@github.com/"
-    git config --global "url.https://git:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "git@github.com:"
+    git config --global url."https://ssh:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "ssh://git@github.com/"
+    git config --global url."https://git:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "git@github.com:"
 }
 
 Write-Host "---------- git config --list -------------"

package.json

@@ -35,7 +35,7 @@
     "@kubernetes/client-node": "^0.16.3",
     "@octokit/core": "^5.1.0",
     "async-wait-until": "^2.0.12",
-    "aws-sdk": "^2.1081.0",
+    "aws-sdk": "^2.1692.0",
     "base-64": "^1.0.0",
     "commander": "^9.0.0",
     "commander-ts": "^0.2.0",

src/model/docker.ts

@@ -113,6 +113,7 @@ class Docker {
             --volume "C:/ProgramData/Microsoft/VisualStudio":"C:/ProgramData/Microsoft/VisualStudio" \
             --volume "${actionFolder}/default-build-script":"c:/UnityBuilderAction" \
             --volume "${actionFolder}/platforms/windows":"c:/steps" \
+            --volume "${actionFolder}/unity-config":"C:/ProgramData/Unity/config" \
             --volume "${actionFolder}/BlankProject":"c:/BlankProject" \
             --cpus=${dockerCpuLimit} \
             --memory=${dockerMemoryLimit} \

src/model/platform-validation/validate-windows.ts

@@ -4,9 +4,14 @@ import { BuildParameters } from '..';
 class ValidateWindows {
   public static validate(buildParameters: BuildParameters) {
     ValidateWindows.validateWindowsPlatformRequirements(buildParameters.targetPlatform);
-    if (!(process.env.UNITY_EMAIL && process.env.UNITY_PASSWORD)) {
-      throw new Error(`Unity email and password must be set for Windows based builds to
-                       authenticate the license. Make sure to set them inside UNITY_EMAIL
+
+    const { unityLicensingServer } = buildParameters;
+    const hasLicensingCredentials = process.env.UNITY_EMAIL && process.env.UNITY_PASSWORD;
+    const hasValidLicensingStrategy = hasLicensingCredentials || unityLicensingServer;
+
+    if (!hasValidLicensingStrategy) {
+      throw new Error(`Unity email and password or alternatively a Unity licensing server url must be set for 
+                       Windows based builds to authenticate the license. Make sure to set them inside UNITY_EMAIL
                        and UNITY_PASSWORD in Github Secrets and pass them into the environment.`);
     }
   }

src/model/versioning.ts

@@ -207,7 +207,21 @@ export default class Versioning {
    * identifies the current commit.
    */
   static async getVersionDescription() {
-    return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
+    const versionTags = (await this.git(['tag', '--list', '--merged', 'HEAD', '--sort=-creatordate']))
+      .split('\n')
+      .filter((tag) => new RegExp(this.grepCompatibleInputVersionRegex).test(tag));
+
+    if (versionTags.length === 0) {
+      core.warning('No valid version tags found. Using fallback description.');
+
+      return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
+    }
+
+    const latestVersionTag = versionTags[0];
+    const commitsCount = (await this.git(['rev-list', `${latestVersionTag}..HEAD`, '--count'])).trim();
+    const commitHash = (await this.git(['rev-parse', '--short', 'HEAD'])).trim();
+
+    return `${latestVersionTag}-${commitsCount}-g${commitHash}`;
   }
 
   /**

yarn.lock

@@ -1832,10 +1832,10 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-aws-sdk@^2.1081.0:
-  version "2.1437.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1437.0.tgz#5b6d9e90da727031b095032b0114d0e085107f05"
-  integrity sha512-ApsAHaeDQFXM8y6OcRLMzUKXVgDZXPJtq1MLG7cqrKkRIugLMTx3j0UHFfF5j6hLHfX0KWrIOCwXEo6qUjviZQ==
+aws-sdk@^2.1692.0:
+  version "2.1692.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1692.0.tgz#9dac5f7bfcc5ab45825cc8591b12753aa7d2902c"
+  integrity sha512-x511uiJ/57FIsbgUe5csJ13k3uzu25uWQE+XqfBis/sB0SFoiElJWXRkgEAUh0U6n40eT3ay5Ue4oPkRMu1LYw==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -1846,7 +1846,7 @@ aws-sdk@^2.1081.0:
     url "0.10.3"
     util "^0.12.4"
     uuid "8.0.0"
-    xml2js "0.5.0"
+    xml2js "0.6.2"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -6251,14 +6251,7 @@ underscore@^1.9.1:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
   integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
 
-undici@^5.14.0:
-  version "5.28.3"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b"
-  integrity "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA=="
-  dependencies:
-    "@fastify/busboy" "^2.0.0"
-
-undici@^5.25.4:
+undici@^5.14.0, undici@^5.25.4:
   version "5.28.3"
   resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b"
   integrity sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==
@@ -6545,7 +6538,15 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
-xml2js@0.5.0, xml2js@^0.5.0:
+xml2js@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499"
+  integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
+xml2js@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7"
   integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==