Make sure AAD token is passed down. (#751)

This commit is contained in:
Andres Paz 2021-06-22 19:29:52 -07:00 коммит произвёл GitHub
Родитель ce8c50ffc7
Коммит e63c06bfd0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 10 добавлений и 0 удалений

Просмотреть файл

@ -569,6 +569,7 @@ let ``Submit uses default values`` () =
Base URI: Base URI:
Location: myLocation Location: myLocation
Credential: Default Credential: Default
AadToken:
Job Name: Job Name:
Shots: 500 Shots: 500
Output: FriendlyUri Output: FriendlyUri
@ -589,6 +590,7 @@ let ``Submit uses default values with default target`` () =
Base URI: Base URI:
Location: myLocation Location: myLocation
Credential: Default Credential: Default
AadToken:
Job Name: Job Name:
Shots: 500 Shots: 500
Output: FriendlyUri Output: FriendlyUri
@ -621,6 +623,7 @@ let ``Submit allows overriding default values`` () =
Base URI: Base URI:
Location: myLocation Location: myLocation
Credential: CLI Credential: CLI
AadToken: myTok
Job Name: myJobName Job Name: myJobName
Shots: 750 Shots: 750
Output: FriendlyUri Output: FriendlyUri
@ -657,6 +660,7 @@ let ``Submit extracts the location from a quantum endpoint`` () =
Base URI: https://westus.quantum.microsoft.com/ Base URI: https://westus.quantum.microsoft.com/
Location: westus Location: westus
Credential: VisualStudio Credential: VisualStudio
AadToken: myTok
Job Name: myJobName Job Name: myJobName
Shots: 750 Shots: 750
Output: FriendlyUri Output: FriendlyUri
@ -689,6 +693,7 @@ let ``Submit allows overriding default values with default target`` () =
Base URI: Base URI:
Location: myLocation Location: myLocation
Credential: Interactive Credential: Interactive
AadToken: myTok
Job Name: myJobName Job Name: myJobName
Shots: 750 Shots: 750
Output: FriendlyUri Output: FriendlyUri
@ -724,6 +729,7 @@ let ``Submit allows to include --base-uri option when --location is not present`
Base URI: http://mybaseuri.foo.com/ Base URI: http://mybaseuri.foo.com/
Location: mybaseuri Location: mybaseuri
Credential: Default Credential: Default
AadToken:
Job Name: Job Name:
Shots: 500 Shots: 500
Output: FriendlyUri Output: FriendlyUri
@ -746,6 +752,7 @@ let ``Submit allows to include --location option when --base-uri is not present`
Base URI: Base URI:
Location: myLocation Location: myLocation
Credential: Default Credential: Default
AadToken:
Job Name: Job Name:
Shots: 500 Shots: 500
Output: FriendlyUri Output: FriendlyUri
@ -772,6 +779,7 @@ let ``Submit allows spaces for the --location option`` () =
Base URI: Base URI:
Location: My Location Location: My Location
Credential: Default Credential: Default
AadToken:
Job Name: Job Name:
Shots: 500 Shots: 500
Output: FriendlyUri Output: FriendlyUri

Просмотреть файл

@ -346,6 +346,7 @@ namespace Microsoft.Quantum.EntryPointDriver
$"Base URI: {BaseUri}", $"Base URI: {BaseUri}",
$"Location: {Location ?? ExtractLocation(BaseUri)}", $"Location: {Location ?? ExtractLocation(BaseUri)}",
$"Credential: {Credential}", $"Credential: {Credential}",
$"AadToken: {AadToken?.Substring(0, 5)}",
$"Job Name: {JobName}", $"Job Name: {JobName}",
$"Shots: {Shots}", $"Shots: {Shots}",
$"Output: {Output}", $"Output: {Output}",

Просмотреть файл

@ -470,6 +470,7 @@ namespace Microsoft.Quantum.EntryPointDriver
Workspace = azureSettings.Workspace, Workspace = azureSettings.Workspace,
Target = DefaultIfShadowed(entryPoint, TargetOption, azureSettings.Target), Target = DefaultIfShadowed(entryPoint, TargetOption, azureSettings.Target),
Storage = DefaultIfShadowed(entryPoint, StorageOption, azureSettings.Storage), Storage = DefaultIfShadowed(entryPoint, StorageOption, azureSettings.Storage),
AadToken = DefaultIfShadowed(entryPoint, AadTokenOption, azureSettings.AadToken),
BaseUri = DefaultIfShadowed(entryPoint, BaseUriOption, azureSettings.BaseUri), BaseUri = DefaultIfShadowed(entryPoint, BaseUriOption, azureSettings.BaseUri),
Location = DefaultIfShadowed(entryPoint, LocationOption, azureSettings.Location), Location = DefaultIfShadowed(entryPoint, LocationOption, azureSettings.Location),
Credential = DefaultIfShadowed(entryPoint, CredentialOption, azureSettings.Credential), Credential = DefaultIfShadowed(entryPoint, CredentialOption, azureSettings.Credential),