Add Dynamic Profile Generators

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -491,12 +491,14 @@ namespace TerminalAppLocalTests
                 L"default profiles in the opposite order of the default ordering."));
 
             CascadiaSettings settings;
-            settings._LayerJsonString(defaultProfilesString, true);
+            settings._ParseJsonString(defaultProfilesString, true);
+            settings.LayerJson(settings._defaultSettings);
             VERIFY_ARE_EQUAL(2u, settings._profiles.size());
             VERIFY_ARE_EQUAL(L"profile2", settings._profiles.at(0)._name);
             VERIFY_ARE_EQUAL(L"profile3", settings._profiles.at(1)._name);
 
-            settings._LayerJsonString(userProfiles0String, false);
+            settings._ParseJsonString(userProfiles0String, false);
+            settings.LayerJson(settings._userSettings);
             VERIFY_ARE_EQUAL(2u, settings._profiles.size());
             VERIFY_ARE_EQUAL(L"profile1", settings._profiles.at(0)._name);
             VERIFY_ARE_EQUAL(L"profile0", settings._profiles.at(1)._name);
@@ -512,12 +514,14 @@ namespace TerminalAppLocalTests
                 L"Case 2: Make sure all the user's profiles appear before the defaults."));
 
             CascadiaSettings settings;
-            settings._LayerJsonString(defaultProfilesString, true);
+            settings._ParseJsonString(defaultProfilesString, true);
+            settings.LayerJson(settings._defaultSettings);
             VERIFY_ARE_EQUAL(2u, settings._profiles.size());
             VERIFY_ARE_EQUAL(L"profile2", settings._profiles.at(0)._name);
             VERIFY_ARE_EQUAL(L"profile3", settings._profiles.at(1)._name);
 
-            settings._LayerJsonString(userProfiles1String, false);
+            settings._ParseJsonString(userProfiles1String, false);
+            settings.LayerJson(settings._userSettings);
             VERIFY_ARE_EQUAL(3u, settings._profiles.size());
             VERIFY_ARE_EQUAL(L"profile2", settings._profiles.at(0)._name);
             VERIFY_ARE_EQUAL(L"profile4", settings._profiles.at(1)._name);
@@ -588,14 +592,16 @@ namespace TerminalAppLocalTests
 
         {
             CascadiaSettings settings;
-            settings._LayerJsonString(defaultProfilesString, true);
+            settings._ParseJsonString(defaultProfilesString, true);
+            settings.LayerJson(settings._defaultSettings);
             VERIFY_ARE_EQUAL(2u, settings._profiles.size());
             VERIFY_ARE_EQUAL(L"profile2", settings._profiles.at(0)._name);
             VERIFY_ARE_EQUAL(L"profile3", settings._profiles.at(1)._name);
             VERIFY_ARE_EQUAL(false, settings._profiles.at(0)._hidden);
             VERIFY_ARE_EQUAL(false, settings._profiles.at(1)._hidden);
 
-            settings._LayerJsonString(userProfiles0String, false);
+            settings._ParseJsonString(userProfiles0String, false);
+            settings.LayerJson(settings._userSettings);
             VERIFY_ARE_EQUAL(2u, settings._profiles.size());
             VERIFY_ARE_EQUAL(L"profile1", settings._profiles.at(0)._name);
             VERIFY_ARE_EQUAL(L"profile0", settings._profiles.at(1)._name);
@@ -611,14 +617,16 @@ namespace TerminalAppLocalTests
 
         {
             CascadiaSettings settings;
-            settings._LayerJsonString(defaultProfilesString, true);
+            settings._ParseJsonString(defaultProfilesString, true);
+            settings.LayerJson(settings._defaultSettings);
             VERIFY_ARE_EQUAL(2u, settings._profiles.size());
             VERIFY_ARE_EQUAL(L"profile2", settings._profiles.at(0)._name);
             VERIFY_ARE_EQUAL(L"profile3", settings._profiles.at(1)._name);
             VERIFY_ARE_EQUAL(false, settings._profiles.at(0)._hidden);
             VERIFY_ARE_EQUAL(false, settings._profiles.at(1)._hidden);
 
-            settings._LayerJsonString(userProfiles1String, false);
+            settings._ParseJsonString(userProfiles1String, false);
+            settings.LayerJson(settings._userSettings);
             VERIFY_ARE_EQUAL(4u, settings._profiles.size());
             VERIFY_ARE_EQUAL(L"profile2", settings._profiles.at(0)._name);
             VERIFY_ARE_EQUAL(L"profile4", settings._profiles.at(1)._name);
@@ -788,7 +796,8 @@ namespace TerminalAppLocalTests
         const auto settings0Json = VerifyParseSucceeded(settings0String);
 
         CascadiaSettings settings;
-        settings._LayerJsonString(settings0String, false);
+        settings._ParseJsonString(settings0String, false);
+        settings.LayerJson(settings._userSettings);
 
         VERIFY_ARE_EQUAL(2u, settings._profiles.size());
         VERIFY_IS_TRUE(settings._profiles.at(0)._guid.has_value());
@@ -824,14 +833,16 @@ namespace TerminalAppLocalTests
         const auto settings0Json = VerifyParseSucceeded(settings0String);
 
         CascadiaSettings settings;
-        settings._LayerJsonString(DefaultJson, true);
+        settings._ParseJsonString(DefaultJson, true);
+        settings.LayerJson(settings._defaultSettings);
         VERIFY_ARE_EQUAL(2u, settings._profiles.size());
         VERIFY_IS_TRUE(settings._profiles.at(0)._guid.has_value());
         VERIFY_IS_TRUE(settings._profiles.at(1)._guid.has_value());
         VERIFY_ARE_EQUAL(L"Windows PowerShell", settings._profiles.at(0)._name);
         VERIFY_ARE_EQUAL(L"cmd", settings._profiles.at(1)._name);
 
-        settings._LayerJsonString(settings0String, false);
+        settings._ParseJsonString(settings0String, false);
+        settings.LayerJson(settings._userSettings);
 
         VERIFY_ARE_EQUAL(4u, settings._profiles.size());
         VERIFY_IS_TRUE(settings._profiles.at(0)._guid.has_value());
@@ -923,14 +934,16 @@ namespace TerminalAppLocalTests
         const auto settings0Json = VerifyParseSucceeded(settings0String);
 
         CascadiaSettings settings;
-        settings._LayerJsonString(DefaultJson, true);
+        settings._ParseJsonString(DefaultJson, true);
+        settings.LayerJson(settings._defaultSettings);
         VERIFY_ARE_EQUAL(2u, settings._profiles.size());
         VERIFY_IS_TRUE(settings._profiles.at(0)._guid.has_value());
         VERIFY_IS_TRUE(settings._profiles.at(1)._guid.has_value());
         VERIFY_ARE_EQUAL(L"Windows PowerShell", settings._profiles.at(0)._name);
         VERIFY_ARE_EQUAL(L"cmd", settings._profiles.at(1)._name);
 
-        settings._LayerJsonString(settings0String, false);
+        settings._ParseJsonString(settings0String, false);
+        settings.LayerJson(settings._userSettings);
 
         VERIFY_ARE_EQUAL(4u, settings._profiles.size());
         VERIFY_IS_TRUE(settings._profiles.at(0)._guid.has_value());

src/cascadia/TerminalApp/AzureCloudShellGenerator.cpp

@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+
+#include <winrt/Microsoft.Terminal.TerminalConnection.h>
+
+#include "AzureCloudShellGenerator.h"
+#include "LegacyProfileGeneratorNamespaces.h"
+
+#include "../../types/inc/utils.hpp"
+#include "../../inc/DefaultSettings.h"
+#include "Utils.h"
+#include "DefaultProfileUtils.h"
+
+using namespace ::TerminalApp;
+
+std::wstring_view AzureCloudShellGenerator::GetNamespace()
+{
+    return AzureGeneratorNamespace;
+}
+
+// Method Description:
+// - Checks if the Azure Cloud shell is available on this platform, and if it
+//   is, creates a profile to be able to launch it.
+// Arguments:
+// - <none>
+// Return Value:
+// - a vector with the Azure Cloud Shell connection profile, if available.
+std::vector<TerminalApp::Profile> AzureCloudShellGenerator::GenerateProfiles()
+{
+    std::vector<TerminalApp::Profile> profiles;
+
+    if (winrt::Microsoft::Terminal::TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
+    {
+        auto azureCloudShellProfile{ CreateDefaultProfile(L"Azure Cloud Shell") };
+        azureCloudShellProfile.SetCommandline(L"Azure");
+        azureCloudShellProfile.SetStartingDirectory(DEFAULT_STARTING_DIRECTORY);
+        azureCloudShellProfile.SetColorScheme({ L"Vintage" });
+        azureCloudShellProfile.SetAcrylicOpacity(0.6);
+        azureCloudShellProfile.SetUseAcrylic(true);
+        azureCloudShellProfile.SetCloseOnExit(false);
+        azureCloudShellProfile.SetConnectionType(AzureConnectionType);
+        profiles.emplace_back(azureCloudShellProfile);
+    }
+
+    return profiles;
+}

src/cascadia/TerminalApp/AzureCloudShellGenerator.h

@@ -0,0 +1,34 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- AzureCloudShellGenerator
+
+Abstract:
+- This is the dynamic profile generator for the azure cloud shell connector.
+  Checks if the Azure Cloud shell is available on this platform, and if it is,
+  creates a profile to be able to launch it.
+
+Author(s):
+- Mike Griese - August 2019
+
+--*/
+
+#pragma once
+#include "IDynamicProfileGenerator.h"
+
+static constexpr GUID AzureConnectionType = { 0xd9fcfdfa, 0xa479, 0x412c, { 0x83, 0xb7, 0xc5, 0x64, 0xe, 0x61, 0xcd, 0x62 } };
+
+namespace TerminalApp
+{
+    class AzureCloudShellGenerator : public TerminalApp::IDynamicProfileGenerator
+    {
+    public:
+        AzureCloudShellGenerator() = default;
+        ~AzureCloudShellGenerator() = default;
+        std::wstring_view GetNamespace() override;
+
+        std::vector<TerminalApp::Profile> GenerateProfiles() override;
+    };
+};