Skip to content
This repository was archived by the owner on Feb 23, 2024. It is now read-only.

Commit 9422e11

Browse files
committed
handle credentials for non app insights logger types
1 parent e5a782c commit 9422e11

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

src/APIM_ARMTemplate/apimtemplate/Commands/Extract.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -414,19 +414,11 @@ private async void GenerateLoggerTemplate(string resourceGroup, string apimname,
414414
loggerResource.apiVersion = "2018-06-01-preview";
415415
loggerResource.scale = null;
416416

417-
// swap credentials for their hidden values, taken from named values
418-
if (loggerResource.properties.credentials != null)
417+
// swap instrumentation key credentials for their hidden values if the logger is app insights, taken from named values
418+
if (loggerResource.properties.credentials != null && loggerResource.properties.credentials.instrumentationKey != null)
419419
{
420-
if (loggerResource.properties.credentials.instrumentationKey != null)
421-
{
422-
string hiddenKey = loggerResource.properties.credentials.instrumentationKey.Substring(2, loggerResource.properties.credentials.instrumentationKey.Length - 4);
423-
loggerResource.properties.credentials.instrumentationKey = propertyResources.Find(p => p.properties.displayName == hiddenKey).properties.value;
424-
}
425-
else if (loggerResource.properties.credentials.connectionString != null)
426-
{
427-
string hiddenKey = loggerResource.properties.credentials.connectionString.Substring(2, loggerResource.properties.credentials.connectionString.Length - 4);
428-
loggerResource.properties.credentials.connectionString = propertyResources.Find(p => p.properties.displayName == hiddenKey).properties.value;
429-
}
420+
string hiddenKey = loggerResource.properties.credentials.instrumentationKey.Substring(2, loggerResource.properties.credentials.instrumentationKey.Length - 4);
421+
loggerResource.properties.credentials.instrumentationKey = propertyResources.Find(p => p.properties.displayName == hiddenKey).properties.value;
430422
}
431423

432424
templateResources.Add(loggerResource);

src/APIM_ARMTemplate/apimtemplate/Properties/launchSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"profiles": {
33
"apimtemplate": {
44
"commandName": "Project",
5-
"commandLineArgs": "extract --name LucasLinked2 --resourceGroup LucasHuetHudsonInternal --fileFolder C:\\Users\\lucashh\\Desktop\\Projects\\APIM-ARM\\ExtractedTemplates"
5+
"commandLineArgs": "extract --name apiphany --resourceGroup vlvinogr-apim --fileFolder C:\\Users\\lucashh\\Desktop\\Projects\\APIM-ARM\\ExtractedTemplates"
66
}
77
}
88
}

0 commit comments

Comments
 (0)