Skip to content

Commit a3aefb0

Browse files
authored
refactor:remove stack name and rename GetAllUINames to GetUIDomainPairs (#603)
1 parent a185537 commit a3aefb0

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/Contrib/StackSdks/Masa.Contrib.StackSdks.Config/MasaStackConfigExtensions.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,17 @@ public static string GetSsoDomain(this IMasaStackConfig masaStackConfig)
104104
return GetDomain(masaStackConfig, MasaStackConstant.AUTH, MasaStackConstant.SSO);
105105
}
106106

107-
public static IEnumerable<(string, string, string)> GetAllUINames(this IMasaStackConfig masaStackConfig)
107+
public static IEnumerable<KeyValuePair<string, string>> GetUIDomainPairs(this IMasaStackConfig masaStackConfig)
108108
{
109109
foreach (var web in GetAllWeb(masaStackConfig))
110110
{
111111
var id = web["id"]?.ToString() ?? "";
112-
var name = web["name"]?.ToString() ?? "";
113112
var domain = web["domain"]?.ToString() ?? "";
114113
if (string.IsNullOrEmpty(id))
115114
{
116115
continue;
117116
}
118-
yield return (id, name, domain);
117+
yield return new KeyValuePair<string, string>(id, domain);
119118
}
120119
}
121120

src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/MasaStackConfigTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void TestGetEnvironment()
8080
[TestMethod]
8181
public void TestGetAllUINames()
8282
{
83-
var allUIs = _stackConfig.GetAllUINames();
83+
var allUIs = _stackConfig.GetUIDomainPairs();
8484

8585
Assert.IsNotNull(allUIs);
8686
}

src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Config.Tests/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"DOMAIN_NAME": "masastack.com",
55
"ELASTIC": "{\"Nodes\": [\"masastack-es.masastack\"],\"Index\": \"user_dev\"}",
66
"IS_DEMO": "true",
7-
"MASA_STACK": "[{\"id\":\"pm\",\"name\":\"PM\",\"service\":{\"name\":\"PM.Service\",\"id\":\"pm-service\",\"domain\":\"pm-staging.masastack\"},\"web\":{\"name\":\"PM.Web\",\"id\":\"pm-web\",\"domain\":\"\"}},{\"id\":\"dcc\",\"name\":\"DCC\",\"service\":{\"name\":\"Dcc.Service\",\"id\":\"dcc-service\",\"domain\":\"dcc-staging.masastack\"},\"web\":{\"name\":\"DCC.Web\",\"id\":\"dcc-web\",\"domain\":\"\"}},{\"id\":\"tsc\",\"name\":\"TSC\",\"service\":{\"name\":\"TSC.Service\",\"id\":\"tsc-service\",\"domain\":\"\"},\"web\":{\"name\":\"TSC.Web\",\"id\":\"tsc-web\",\"domain\":\"\"}},{\"id\":\"alert\",\"name\":\"Alert\",\"service\":{\"name\":\"Alert.Service\",\"id\":\"alert-service\",\"domain\":\"\"},\"web\":{\"name\":\"Alert.Web\",\"id\":\"alert-web\",\"domain\":\"\"}},{\"id\":\"scheduler\",\"name\":\"Scheduler\",\"service\":{\"name\":\"Scheduler.Service\",\"id\":\"scheduler-service\",\"domain\":\"\"},\"worker\":{\"name\":\"Scheduler.Worker\",\"id\":\"scheduler-worker\",\"domain\":\"\"},\"web\":{\"name\":\"Scheduler.Web\",\"id\":\"scheduler-web\",\"domain\":\"\"}},{\"id\":\"mc\",\"name\":\"MC\",\"service\":{\"name\":\"MC.Service\",\"id\":\"mc-service\",\"domain\":\"\"},\"web\":{\"name\":\"MC.Web\",\"id\":\"mc-web\",\"domain\":\"\"}},{\"id\":\"auth\",\"name\":\"Auth\",\"service\":{\"name\":\"Auth.Service\",\"id\":\"auth-service\",\"domain\":\"\"},\"web\":{\"name\":\"Auth.Web\",\"id\":\"auth-web\",\"domain\":\"\"},\"sso\":{\"name\":\"Auth.SSO\",\"id\":\"auth-sso\",\"domain\":\"\"}}]",
7+
"MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service\",\"domain\":\"pm-staging.masastack\"},\"web\":{\"id\":\"pm-web\",\"domain\":\"pm.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service\",\"domain\":\"dcc-staging.masastack\"},\"web\":{\"id\":\"dcc-web\",\"domain\":\"\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service\",\"domain\":\"\"},\"web\":{\"id\":\"tsc-web\",\"domain\":\"\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service\",\"domain\":\"\"},\"web\":{\"id\":\"alert-web\",\"domain\":\"\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service\",\"domain\":\"\"},\"worker\":{\"id\":\"scheduler-worker\",\"domain\":\"\"},\"web\":{\"id\":\"scheduler-web\",\"domain\":\"\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service\",\"domain\":\"\"},\"web\":{\"id\":\"mc-web\",\"domain\":\"\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service\",\"domain\":\"\"},\"web\":{\"id\":\"auth-web\",\"domain\":\"\"},\"sso\":{\"id\":\"auth-sso\",\"domain\":\"\"}}]",
88
"OTLP_URL": "otel-collector.masastack:9013",
99
"REDIS": "{\"RedisHost\": \"localhost\", \"RedisPort\": 6379, \"RedisDb\": 0,\"RedisPassword\": \"\"}",
1010
"VERSION": "1.0-Preview1",

0 commit comments

Comments
 (0)