Skip to content

Commit

Permalink
Update new service connection name (#20398)
Browse files Browse the repository at this point in the history
* update service connection name strings

* revert npm auth updates

* revert generated npm auth files and add twine files

* bump maven version

* twine correction

* twine sstring update

* re-bump version

* bump version again

* bump nuget

* bump

* fix versioning

* update cargo version

* bump pip version

* remove npm auth changes

* CondaAuth Version fixes

* maven auth

* twine

* fix maven help text

* maven build help

* --write-updates
  • Loading branch information
embetten authored Sep 12, 2024
1 parent 1b440b0 commit 3d2ca05
Show file tree
Hide file tree
Showing 95 changed files with 408 additions and 336 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"loc.helpMarkDown": "",
"loc.description": "Authentication task for the cargo client used for installing Cargo crates distribution",
"loc.instanceNameFormat": "cargo Authenticate $(configFile)",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.label.workloadIdentityServiceConnection": "'Azure DevOps' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, registryNames is required. All other inputs are ignored.",
"loc.input.label.registryNames": "Registry names from config.toml",
"loc.input.help.registryNames": "Comma seperated list of registry names specified in your config.toml to authenticate. If this is set, workloadIdentityServiceConnection is required. All other inputs are ignored. Not compatible with cargoServiceConnections.",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/CargoAuthenticateV0/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 0,
"Minor": 246,
"Patch": 0
"Patch": 3
},
"runsOn": [
"Agent",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/CargoAuthenticateV0/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 0,
"Minor": 246,
"Patch": 0
"Patch": 3
},
"runsOn": [
"Agent",
Expand Down
3 changes: 2 additions & 1 deletion Tasks/CargoAuthenticateV0/taskJsonOverride.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"inputs": [
{
"name": "workloadIdentityServiceConnection",
"label": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"aliases": ["azureDevOpsServiceConnection"],
"label": "'Azure DevOps' Service Connection",
"helpMarkDown": "If this is set, feedUrl is required. All other inputs are ignored.",
"type": "connectedService:workloadidentityuser",
"required": false,
Expand Down
1 change: 1 addition & 0 deletions Tasks/CargoAuthenticateV0/taskJsonOverride.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"inputs": [
{
"name": "workloadIdentityServiceConnection",
"aliases": ["azureDevOpsServiceConnection"],
"label": "ms-resource:loc.input.label.workloadIdentityServiceConnection",
"helpMarkDown": "ms-resource:loc.input.help.workloadIdentityServiceConnection",
"type": "connectedService:workloadidentityuser",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"loc.helpMarkDown": "",
"loc.description": "Authentication task for the conda client",
"loc.instanceNameFormat": "Conda Authenticate",
"loc.input.label.workloadIdentityServiceConnection": "'Azure DevOps' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"loc.messages.FailedToAddAuthentication": "Failed to add authentication.",
"loc.messages.AddingAuthChannel": "Adding auth for the token %s",
"loc.messages.Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/CondaAuthenticateV0/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 0,
"Minor": 246,
"Patch": 3
"Patch": 6
},
"runsOn": [
"Agent",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/CondaAuthenticateV0/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 0,
"Minor": 246,
"Patch": 3
"Patch": 6
},
"runsOn": [
"Agent",
Expand Down
3 changes: 2 additions & 1 deletion Tasks/CondaAuthenticateV0/taskJsonOverride.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"inputs": [
{
"name": "workloadIdentityServiceConnection",
"label": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"aliases": ["azureDevOpsServiceConnection"],
"label": "'Azure DevOps' Service Connection",
"helpMarkDown": "If this is set, it will generate credentials using service connection instead of the build pipeline identity.",
"type": "connectedService:workloadidentityuser",
"required": false,
Expand Down
1 change: 1 addition & 0 deletions Tasks/CondaAuthenticateV0/taskJsonOverride.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"inputs": [
{
"name": "workloadIdentityServiceConnection",
"aliases": ["azureDevOpsServiceConnection"],
"label": "ms-resource:loc.input.label.workloadIdentityServiceConnection",
"helpMarkDown": "ms-resource:loc.input.help.workloadIdentityServiceConnection",
"type": "connectedService:workloadidentityuser",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"loc.input.help.feedUrl": "If this is set, workloadIdentityServiceConnection is required. All other inputs are ignored. Not compatible with nuGetServiceConnections. Feed Url should be in the NuGet service index format, e.g. https://pkgs.dev.azure.com/{ORG_NAME}/{PROJECT}/_packaging/{FEED_NAME}/nuget/v3/index.json/",
"loc.input.label.feedUrl": "Azure Artifacts URL",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, feedUrl is required. All other inputs are ignored.",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.label.workloadIdentityServiceConnection": "'Azure DevOps' Service Connection",
"loc.messages.Error_ServiceConnectionExists": "An existing service connection already exists for the endpoint",
"loc.messages.Error_MissingFeedUrlOrServiceConnection": "Both feedUrl and workloadIdentityServiceConnection must be set together.",
"loc.messages.Info_AddingFederatedFeedAuth": "Unable to get federated credentials from service connection",
Expand Down
106 changes: 53 additions & 53 deletions Tasks/NuGetAuthenticateV1/task.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
{
"id": "f5fd8599-ccfa-4d6e-b965-4d14bed7097b",
"name": "NuGetAuthenticate",
"friendlyName": "NuGet authenticate",
"description": "Configure NuGet tools to authenticate with Azure Artifacts and other NuGet repositories. Requires NuGet >= 4.8.5385, dotnet >= 6, or MSBuild >= 15.8.166.59604",
"author": "Microsoft Corporation",
"helpUrl": "https://aka.ms/NuGetAuthenticateTask",
"helpMarkDown": "[Learn more about this task](https://aka.ms/NuGetAuthenticateTask)",
"category": "Package",
"runsOn": [
"Agent",
"DeploymentGroup"
],
"version": {
"Major": 1,
"Minor": 246,
"Patch": 0
"id": "f5fd8599-ccfa-4d6e-b965-4d14bed7097b",
"name": "NuGetAuthenticate",
"friendlyName": "NuGet authenticate",
"description": "Configure NuGet tools to authenticate with Azure Artifacts and other NuGet repositories. Requires NuGet >= 4.8.5385, dotnet >= 6, or MSBuild >= 15.8.166.59604",
"author": "Microsoft Corporation",
"helpUrl": "https://aka.ms/NuGetAuthenticateTask",
"helpMarkDown": "[Learn more about this task](https://aka.ms/NuGetAuthenticateTask)",
"category": "Package",
"runsOn": [
"Agent",
"DeploymentGroup"
],
"version": {
"Major": 1,
"Minor": 246,
"Patch": 3
},
"minimumAgentVersion": "2.144.0",
"instanceNameFormat": "NuGet Authenticate",
"inputs": [
{
"name": "nuGetServiceConnections",
"type": "connectedService:ExternalNuGetFeed",
"label": "Service connection credentials for feeds outside this organization",
"required": false,
"helpMarkDown": "Comma-separated list of NuGet service connection names for feeds outside this organization/collection. For feeds in this organization/collection, leave this blank; the build’s credentials are used automatically.",
"properties": {
"EditableOptions": "False",
"MultiSelectFlatList": "True"
}
},
"minimumAgentVersion": "2.144.0",
"instanceNameFormat": "NuGet Authenticate",
"inputs": [
{
"name": "nuGetServiceConnections",
"type": "connectedService:ExternalNuGetFeed",
"label": "Service connection credentials for feeds outside this organization",
"required": false,
"helpMarkDown": "Comma-separated list of NuGet service connection names for feeds outside this organization/collection. For feeds in this organization/collection, leave this blank; the build’s credentials are used automatically.",
"properties": {
"EditableOptions": "False",
"MultiSelectFlatList": "True"
}
},
{
"name": "forceReinstallCredentialProvider",
"type": "boolean",
"label": "Reinstall the credential provider even if already installed",
"defaultValue": "false",
"helpMarkDown": "If the credential provider is already installed in the user profile, determines if it is overwritten with the task-provided credential provider. This may upgrade (or potentially downgrade) the credential provider."
}
],
"execution": {
"Node10": {
"target": "main.js",
"argumentFormat": ""
},
"Node16": {
"target": "main.js",
"argumentFormat": ""
}
{
"name": "forceReinstallCredentialProvider",
"type": "boolean",
"label": "Reinstall the credential provider even if already installed",
"defaultValue": "false",
"helpMarkDown": "If the credential provider is already installed in the user profile, determines if it is overwritten with the task-provided credential provider. This may upgrade (or potentially downgrade) the credential provider."
}
],
"execution": {
"Node10": {
"target": "main.js",
"argumentFormat": ""
},
"messages": {
"Error_ServiceConnectionExists": "An existing service connection already exists for the endpoint",
"Error_MissingFeedUrlOrServiceConnection": "Both feedUrl and workloadIdentityServiceConnection must be set together.",
"FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection",
"Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s for feed %s",
"Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for feed %s."
"Node16": {
"target": "main.js",
"argumentFormat": ""
}
},
"messages": {
"Error_ServiceConnectionExists": "An existing service connection already exists for the endpoint",
"Error_MissingFeedUrlOrServiceConnection": "Both feedUrl and workloadIdentityServiceConnection must be set together.",
"FailedToGetServiceConnectionAuth": "Unable to get federated credentials from service connection",
"Info_AddingFederatedFeedAuth": "Adding auth information from service connection %s for feed %s",
"Info_SuccessAddingFederatedFeedAuth": "Successfully added auth for feed %s."
}
}
2 changes: 1 addition & 1 deletion Tasks/NuGetAuthenticateV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 246,
"Patch": 0
"Patch": 3
},
"minimumAgentVersion": "2.144.0",
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
Expand Down
3 changes: 2 additions & 1 deletion Tasks/NuGetAuthenticateV1/taskJsonOverride.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"inputs": [
{
"name": "workloadIdentityServiceConnection",
"label": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"aliases": ["azureDevOpsServiceConnection"],
"label": "'Azure DevOps' Service Connection",
"helpMarkDown": "If this is set, feedUrl is required. All other inputs are ignored.",
"type": "connectedService:workloadidentityuser",
"required": false,
Expand Down
1 change: 1 addition & 0 deletions Tasks/NuGetAuthenticateV1/taskJsonOverride.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"inputs": [
{
"name": "workloadIdentityServiceConnection",
"aliases": ["azureDevOpsServiceConnection"],
"label": "ms-resource:loc.input.label.workloadIdentityServiceConnection",
"helpMarkDown": "ms-resource:loc.input.help.workloadIdentityServiceConnection",
"type": "connectedService:workloadidentityuser",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"loc.group.displayName.feedAuthentication": "Feeds and Authentication",
"loc.input.label.artifactFeeds": "My feeds (select below)",
"loc.input.help.artifactFeeds": "Select feeds to authenticate present in this organization",
"loc.input.label.workloadIdentityServiceConnection": "'Entra Workload ID-backed Azure DevOps user' Service Connection",
"loc.input.label.workloadIdentityServiceConnection": "'Azure DevOps' Service Connection",
"loc.input.help.workloadIdentityServiceConnection": "If this is set, feedUrl is required. All other inputs are ignored.",
"loc.input.label.feedUrl": "Azure Artifacts Feeds url.",
"loc.input.help.feedUrl": "If this is set, workloadIdentityServiceConnection is required. All other inputs are ignored. Not compatible with pythonDownloadServiceConnections. ",
Expand Down
Loading

0 comments on commit 3d2ca05

Please sign in to comment.