Skip to content

Commit d098537

Browse files
vmapetrvmapetr
committed
Merge branch 'master' into Localization
2 parents 8ab3da0 + 045a895 commit d098537

File tree

23 files changed

+227
-147
lines changed

23 files changed

+227
-147
lines changed

‎BuildConfigGen/Program.cs‎

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,8 @@ private static void MainUpdateTask(
594594
// Note: CheckTaskInputContainsPreprocessorInstructions is expensive, so only call if needed
595595
if (versionUpdated || taskConfigExists || HasTaskInputContainsPreprocessorInstructions(gitRootPath, taskTargetPath, config) || config.isNode)
596596
{
597+
var existingLocalPackageVersion = ReadTaskJsonIfExists(taskOutput, "task.json");
598+
597599
CopyConfig(gitRootPath, taskTargetPath, taskOutput, skipPathName: buildConfigs, skipFileName: null, removeExtraFiles: true, throwIfNotUpdatingFileForApplyingOverridesAndPreProcessor: false, config: config, allowPreprocessorDirectives: true);
598600

599601
if (config.enableBuildConfigOverrides)
@@ -609,8 +611,8 @@ private static void MainUpdateTask(
609611

610612
WriteWIFInputTaskJson(taskOutput, config, "task.json", isLoc: false);
611613
WriteWIFInputTaskJson(taskOutput, config, "task.loc.json", isLoc: true);
612-
WriteTaskJson(taskOutput, taskVersionState.configTaskVersionMapping, config, "task.json");
613-
WriteTaskJson(taskOutput, taskVersionState.configTaskVersionMapping, config, "task.loc.json");
614+
WriteTaskJson(taskOutput, taskVersionState, config, "task.json", existingLocalPackageVersion);
615+
WriteTaskJson(taskOutput, taskVersionState, config, "task.loc.json", existingLocalPackageVersion);
614616
}
615617

616618
WriteInputTaskJson(taskTargetPath, taskVersionState.configTaskVersionMapping, "task.json");
@@ -907,21 +909,54 @@ private static void PreprocessIfExtensionEnabledInConfig(string file, Config.Con
907909
}
908910
}
909911

912+
private static string? ReadTaskJsonIfExists(string taskPath, string fileName)
913+
{
914+
string outputTaskPath = Path.Combine(taskPath, fileName);
915+
if(!File.Exists(outputTaskPath))
916+
{
917+
return null;
918+
}
919+
920+
JsonNode outputTaskNode = JsonNode.Parse(ensureUpdateModeVerifier!.FileReadAllText(outputTaskPath))!;
921+
var outputTaskNodeObject = outputTaskNode.AsObject();
922+
923+
// get LocalPackage version from _buildConfigMapping in outputTaskNodeObject (if one exists)
924+
return outputTaskNodeObject["_buildConfigMapping"]?.AsObject()?[Config.LocalPackages.constMappingKey]?.GetValue<string>();
925+
}
910926

911-
private static void WriteTaskJson(string taskPath, Dictionary<Config.ConfigRecord, TaskVersion> configTaskVersionMapping, Config.ConfigRecord config, string fileName)
927+
private static void WriteTaskJson(string taskPath, TaskStateStruct taskState, Config.ConfigRecord config, string fileName, string? existingLocalPackageVersion)
912928
{
913929
string outputTaskPath = Path.Combine(taskPath, fileName);
914930
JsonNode outputTaskNode = JsonNode.Parse(ensureUpdateModeVerifier!.FileReadAllText(outputTaskPath))!;
915-
outputTaskNode["version"]!["Major"] = configTaskVersionMapping[config].Major;
916-
outputTaskNode["version"]!["Minor"] = configTaskVersionMapping[config].Minor;
917-
outputTaskNode["version"]!["Patch"] = configTaskVersionMapping[config].Patch;
918-
outputTaskNode.AsObject()?.Remove("_buildConfigMapping");
931+
932+
outputTaskNode["version"]!["Major"] = taskState.configTaskVersionMapping[config].Major;
933+
outputTaskNode["version"]!["Minor"] = taskState.configTaskVersionMapping[config].Minor;
934+
outputTaskNode["version"]!["Patch"] = taskState.configTaskVersionMapping[config].Patch;
935+
936+
var outputTaskNodeObject = outputTaskNode.AsObject();
937+
outputTaskNodeObject.Remove("_buildConfigMapping");
938+
939+
bool anyVersionsUpdatedExceptForGlobal = taskState.versionsUpdated.Where(x => !x.useGlobalVersion).Any();
919940

920941
JsonObject configMapping = new JsonObject();
921-
var configTaskVersionMappingSortedByConfig = configTaskVersionMapping.OrderBy(x => x.Key.name);
942+
var configTaskVersionMappingSortedByConfig = taskState.configTaskVersionMapping.OrderBy(x => x.Key.name);
922943
foreach (var cfg in configTaskVersionMappingSortedByConfig)
923944
{
924-
configMapping.Add(new(cfg.Key.constMappingKey, cfg.Value.ToString()));
945+
if (!config.useGlobalVersion && cfg.Key.useGlobalVersion && !anyVersionsUpdatedExceptForGlobal)
946+
{
947+
// To minimize noise in version control when adding the globalVersion,
948+
// unless the config being generated is the globalVersion (written to _generated_local),
949+
// if no other versions are updated other than the globalVersion,
950+
// don't change the global version in the existing generated file.
951+
if (existingLocalPackageVersion != null)
952+
{
953+
configMapping.Add(new(cfg.Key.constMappingKey, existingLocalPackageVersion));
954+
}
955+
}
956+
else
957+
{
958+
configMapping.Add(new(cfg.Key.constMappingKey, cfg.Value.ToString()));
959+
}
925960
}
926961

927962
outputTaskNode.AsObject().Add("_buildConfigMapping", configMapping);

‎Tasks/AzureCLIV2/azureclitask.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,11 @@ export class azureclitask {
204204

205205
const federatedToken = await this.getIdToken(connectedService);
206206
tl.setSecret(federatedToken);
207-
const args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
207+
let args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
208208

209+
if(!visibleAzLogin ){
210+
args += ` --output none`;
211+
}
209212
//login using OpenID Connect federation
210213
Utility.throwIfError(tl.execSync("az", args), tl.loc("LoginFailed"));
211214

‎Tasks/AzureCLIV2/task.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"version": {
2121
"Major": 2,
2222
"Minor": 247,
23-
"Patch": 0
23+
"Patch": 2
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "Azure CLI $(scriptPath)",

‎Tasks/AzureCLIV2/task.loc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"version": {
2121
"Major": 2,
2222
"Minor": 247,
23-
"Patch": 0
23+
"Patch": 2
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

‎Tasks/HelmDeployV1/package-lock.json‎

Lines changed: 32 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tasks/HelmDeployV1/task.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [],
2020
"groups": [
@@ -485,7 +485,7 @@
485485
{
486486
"target": "azureResourceGroupForACR",
487487
"endpointId": "$(azureSubscriptionEndpointForACR)",
488-
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerService/managedClusters?api-version=2017-08-31",
488+
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerRegistry/registries?api-version=2019-05-01",
489489
"resultSelector": "jsonpath:$.value[*]",
490490
"resultTemplate": "{{{ #extractResource id resourcegroups}}}"
491491
},

‎Tasks/HelmDeployV1/task.loc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [],
2020
"groups": [
@@ -485,7 +485,7 @@
485485
{
486486
"target": "azureResourceGroupForACR",
487487
"endpointId": "$(azureSubscriptionEndpointForACR)",
488-
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerService/managedClusters?api-version=2017-08-31",
488+
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerRegistry/registries?api-version=2019-05-01",
489489
"resultSelector": "jsonpath:$.value[*]",
490490
"resultTemplate": "{{{ #extractResource id resourcegroups}}}"
491491
},

‎_generated/AzureCLIV2.versionmap.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|2.247.0
2-
Node20_229_2|2.247.1
1+
Default|2.247.2
2+
Node20_229_2|2.247.3

‎_generated/AzureCLIV2/azureclitask.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,11 @@ export class azureclitask {
192192

193193
const federatedToken = await this.getIdToken(connectedService);
194194
tl.setSecret(federatedToken);
195-
const args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
195+
let args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
196196

197+
if(!visibleAzLogin ){
198+
args += ` --output none`;
199+
}
197200
//login using OpenID Connect federation
198201
Utility.throwIfError(tl.execSync("az", args), tl.loc("LoginFailed"));
199202

‎_generated/AzureCLIV2/task.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"version": {
2121
"Major": 2,
2222
"Minor": 247,
23-
"Patch": 0
23+
"Patch": 2
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "Azure CLI $(scriptPath)",
@@ -226,7 +226,7 @@
226226
"KeepingAzSessionActiveUnsupportedScheme": "The 'keepAzSessionActive' input might be used only for workload identity federation ARM service connection. The referenced service endpoint auth scheme was unexpected: %s. Change the scheme or remove 'keepAzSessionActive' input."
227227
},
228228
"_buildConfigMapping": {
229-
"Default": "2.247.0",
230-
"Node20_229_2": "2.247.1"
229+
"Default": "2.247.2",
230+
"Node20_229_2": "2.247.3"
231231
}
232232
}

0 commit comments

Comments
 (0)