Skip to content

Update profile models for ps1xml table format #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 9, 2018
Merged

Update profile models for ps1xml table format #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
237e089
update modules to match old ps1xml
Nov 5, 2018
69ee45f
add positions
Nov 5, 2018
f591a05
update labels
Nov 6, 2018
353d9db
Merge branch 'dev' into profileformat
markcowl Nov 9, 2018
c864cc2
Merge branch 'dev' into profileformat
markcowl Nov 9, 2018
fc074db
Merge branch 'dev' into profileformat
markcowl Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Authentication.ResourceManager/Models/PSAzureContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,30 +150,30 @@ public PSAzureContext(PSObject other)
/// <summary>
/// The name of the context. The context may be selected by name
/// </summary>
[Ps1Xml(Label = "Context Name", Target = ViewControl.Table)]
[Ps1Xml(Label = "Name", Target = ViewControl.Table, Position = 0)]
public string Name { get; set; }
/// <summary>
/// The account used to connect to Azure.
/// </summary>
[Ps1Xml(Label = "Account id", Target = ViewControl.Table, ScriptBlock = "$_.Account.Id")]
[Ps1Xml(Label = "Account", Target = ViewControl.Table, Position = 1)]
public IAzureAccount Account { get; set; }

/// <summary>
/// The endpoint and connection metadata for the targeted instance of the Azure cloud.
/// </summary>
[Ps1Xml(Label = "Environment Name", Target = ViewControl.Table, ScriptBlock = "$_.Environment.Name")]
[Ps1Xml(Label = "Environment", Target = ViewControl.Table, Position = 3)]
public IAzureEnvironment Environment { get; set; }

/// <summary>
/// The subscription targeted in Azure.
/// </summary>
[Ps1Xml(Label = "Subscription Name", Target = ViewControl.Table, ScriptBlock = "$_.Subscription.Name")]
[Ps1Xml(Label = "SubscriptionName", Target = ViewControl.Table, ScriptBlock = "$_.Subscription.Name", Position = 2)]
public IAzureSubscription Subscription { get; set; }

/// <summary>
/// The targeted tenant in Azure.
/// </summary>
[Ps1Xml(Label = "Tenant Id", Target = ViewControl.Table, ScriptBlock = "$_.Tenant.Id")]
[Ps1Xml(Label = "TenantId", Target = ViewControl.Table, ScriptBlock = "$_.Tenant.ToString()", Position = 4)]
public IAzureTenant Tenant { get; set; }

public IAzureTokenCache TokenCache { get; set; }
Expand Down
4 changes: 4 additions & 0 deletions src/Authentication.ResourceManager/Models/PSAzureEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
using Microsoft.Azure.Commands.Profile.Common;
using Microsoft.WindowsAzure.Commands.Common.Attributes;
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down Expand Up @@ -117,6 +118,7 @@ public PSAzureEnvironment(PSObject other)
/// <summary>
/// Gets or sets the name of the environment.
/// </summary>
[Ps1Xml(Label = "Name", Target = ViewControl.Table, Position = 0)]
public string Name { get; set; }

/// <summary>
Expand Down Expand Up @@ -170,6 +172,7 @@ public bool OnPremise
/// <summary>
/// Gets or sets the Uri of the Azure Resource Manager (ARM) service.
/// </summary>
[Ps1Xml(Label = "Resource Manager Url", Target = ViewControl.Table, Position = 1)]
public string ResourceManagerUrl { get; set; }

/// <summary>
Expand All @@ -185,6 +188,7 @@ public bool OnPremise
/// <summary>
/// Gets or sets the Uri of the Active Directory authentication endpoint.
/// </summary>
[Ps1Xml(Label = "ActiveDirectory Authority", Target = ViewControl.Table, Position = 2)]
public string ActiveDirectoryAuthority { get; set; }

/// <summary>
Expand Down
8 changes: 4 additions & 4 deletions src/Authentication.ResourceManager/Models/PSAzureProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ public IDictionary<string, PSAzureEnvironment> Environments
/// <summary>
/// The current credentials and metadata for connecting with the current Azure cloud instance.
/// </summary>
[Ps1Xml(Label = "Account Name", Target = ViewControl.Table, ScriptBlock = "$_.Context.Account.Name")]
[Ps1Xml(Label = "Subscription Name", Target = ViewControl.Table, ScriptBlock = "$_.Context.Subscription.Name")]
[Ps1Xml(Label = "Tenant Id", Target = ViewControl.Table, ScriptBlock = "$_.Context.Tenant.Name")]
[Ps1Xml(Label = "Environment Name", Target = ViewControl.Table, ScriptBlock = "$_.Context.Environment.Name")]
[Ps1Xml(Label = "Account", Target = ViewControl.Table, ScriptBlock = "$_.Context.Account.ToString()", Position = 0)]
[Ps1Xml(Label = "SubscriptionName", Target = ViewControl.Table, ScriptBlock = "$_.Context.Subscription.Name", Position = 1)]
[Ps1Xml(Label = "TenantId", Target = ViewControl.Table, ScriptBlock = "$_.Context.Tenant.ToString()", Position = 2)]
[Ps1Xml(Label = "Environment", Target = ViewControl.Table, ScriptBlock = "$_.Context.Environment.ToString()", Position = 3)]
public PSAzureContext Context { get; set; }

public override string ToString()
Expand Down
8 changes: 4 additions & 4 deletions src/Authentication.ResourceManager/Models/PSAzureSubscription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ public PSAzureSubscription(PSObject other)
}

/// <inheritdoc />
[Ps1Xml(Label = "Subscription Id", Target = ViewControl.Table)]
[Ps1Xml(Label = "Id", Target = ViewControl.Table, Position = 1)]
public string Id { get; set; }

/// <inheritdoc />
[Ps1Xml(Label = "Subscription Name", Target = ViewControl.Table)]
[Ps1Xml(Label = "Name", Target = ViewControl.Table, Position = 0)]
public string Name { get; set; }

/// <inheritdoc />
[Ps1Xml]
[Ps1Xml(Label = "State", Target = ViewControl.Table, Position = 3)]
public string State { get; set; }

/// <summary>
Expand All @@ -107,7 +107,7 @@ public PSAzureSubscription(PSObject other)
/// <summary>
/// The tenant home for the subscription.
/// </summary>
[Ps1Xml(Label = "Tenant Id", Target = ViewControl.Table)]
[Ps1Xml(Label = "TenantId", Target = ViewControl.Table, Position = 2)]
public string TenantId
{
get
Expand Down
4 changes: 2 additions & 2 deletions src/Authentication.ResourceManager/Models/PSAzureTenant.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ public PSAzureTenant(PSObject other)
/// <summary>
/// The tenant id.
/// </summary>
[Ps1Xml(Label = "Tenant Id", Target = ViewControl.Table)]
[Ps1Xml(Label = "Id", Target = ViewControl.Table, Position = 0)]
public string Id { get; set; }

/// <summary>
/// The name of the subscription.
/// </summary>
[Ps1Xml(Label = "Directory Name", Target = ViewControl.Table)]
[Ps1Xml(Label = "Directory", Target = ViewControl.Table, Position = 1)]
public string Directory { get; set; }

/// <summary>
Expand Down