Skip to content

KeyVault: Add support for specifying CeritifcateType in certificate p… #2997

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 1 commit into from
Sep 23, 2016
Merged

KeyVault: Add support for specifying CeritifcateType in certificate p… #2997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<Reference Include="Microsoft.Azure.Graph.RBAC">
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.2.0-preview\lib\net45\Microsoft.Azure.Graph.RBAC.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.KeyVault, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.0.1-preview\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
<Reference Include="Microsoft.Azure.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.0.2-preview\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.KeyVault.WebKey, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault" version="2.0.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault" version="2.0.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault.WebKey" version="2.0.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.KeyVault" version="2.0.0-preview" targetFramework="net45" />
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@
<Reference Include="Microsoft.Azure.Graph.RBAC">
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.2.0-preview\lib\net45\Microsoft.Azure.Graph.RBAC.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.KeyVault, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.0.1-preview\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
<Reference Include="Microsoft.Azure.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.0.2-preview\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.KeyVault.WebKey, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
8 changes: 8 additions & 0 deletions src/ResourceManager/KeyVault/Commands.KeyVault/Commands/NewAzureKeyVaultCertificatePolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ public class NewAzureKeyVaultCertificatePolicy : KeyVaultCmdletBase
HelpMessage = "Specifies the name of the issuer for this certificate.")]
public string IssuerName { get; set; }

/// <summary>
/// CertificateType
/// </summary>
[Parameter(ValueFromPipelineByPropertyName = true,
HelpMessage = "Specifies the type of certificate to the issuer.")]
public string CertificateType { get; set; }

/// <summary>
/// RenewAtNumberOfDaysBeforeExpiry
/// </summary>
Expand Down Expand Up @@ -165,6 +172,7 @@ protected override void ProcessRecord()
Ekus = Ekus,
Enabled = !Disabled.IsPresent,
IssuerName = IssuerName,
CertificateType = CertificateType,
RenewAtNumberOfDaysBeforeExpiry = RenewAtNumberOfDaysBeforeExpiry,
RenewAtPercentageLifetime = RenewAtPercentageLifetime,
EmailAtNumberOfDaysBeforeExpiry = EmailAtNumberOfDaysBeforeExpiry,
Expand Down
9 changes: 9 additions & 0 deletions src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultCertificatePolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,14 @@ public class SetAzureKeyVaultCertificatePolicy : KeyVaultCmdletBase
HelpMessage = "Specifies the name of the issuer for this certificate.")]
public string IssuerName { get; set; }

/// <summary>
/// CertificateType
/// </summary>
[Parameter(ValueFromPipelineByPropertyName = true,
ParameterSetName = ExpandedParameterSet,
HelpMessage = "Specifies the type of certificate to the issuer.")]
public string CertificateType { get; set; }

/// <summary>
/// RenewAtNumberOfDaysBeforeExpiry
/// </summary>
Expand Down Expand Up @@ -228,6 +236,7 @@ protected override void ProcessRecord()
Ekus = Ekus,
Enabled = !Disabled.IsPresent,
IssuerName = IssuerName,
CertificateType = CertificateType,
RenewAtNumberOfDaysBeforeExpiry = RenewAtNumberOfDaysBeforeExpiry,
RenewAtPercentageLifetime = RenewAtPercentageLifetime,
EmailAtNumberOfDaysBeforeExpiry = EmailAtNumberOfDaysBeforeExpiry,
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultCertificateOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ internal static KeyVaultCertificateOperation FromCertificateOperation(Certificat
StatusDetails = certificateOperation.StatusDetails,
RequestId = certificateOperation.RequestId,
Target = certificateOperation.Target,
Issuer = certificateOperation.IssuerReference.Name,
Issuer = certificateOperation.IssuerParameters.Name,
CancellationRequested = certificateOperation.CancellationRequested,
};

Expand Down
21 changes: 19 additions & 2 deletions src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultCertificatePolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class KeyVaultCertificatePolicy
public List<string> Ekus { get; set; }
public int? ValidityInMonths { get; set; }
public string IssuerName { get; set; }
public string CertificateType { get; set; }
public int? RenewAtNumberOfDaysBeforeExpiry { get; set; }
public int? RenewAtPercentageLifetime { get; set; }
public int? EmailAtNumberOfDaysBeforeExpiry { get; set; }
Expand Down Expand Up @@ -74,7 +75,22 @@ internal CertificatePolicy ToCertificatePolicy()

if (!string.IsNullOrWhiteSpace(IssuerName))
{
certificatePolicy.IssuerReference = new IssuerReference { Name = IssuerName };
if (certificatePolicy.IssuerParameters == null)
{
certificatePolicy.IssuerParameters = new IssuerParameters();
}

certificatePolicy.IssuerParameters.Name = IssuerName;
}

if (!string.IsNullOrWhiteSpace(CertificateType))
{
if (certificatePolicy.IssuerParameters == null)
{
certificatePolicy.IssuerParameters = new IssuerParameters();
}

certificatePolicy.IssuerParameters.CertificateType = CertificateType;
}

if (Enabled.HasValue)
Expand Down Expand Up @@ -204,7 +220,8 @@ internal static KeyVaultCertificatePolicy FromCertificatePolicy(CertificatePolic
KeyUsage = certificatePolicy.X509CertificateProperties == null ? null : certificatePolicy.X509CertificateProperties.KeyUsage == null ? null : new List<string>(certificatePolicy.X509CertificateProperties.KeyUsage),
Ekus = certificatePolicy.X509CertificateProperties == null ? null : certificatePolicy.X509CertificateProperties.Ekus == null ? null : new List<string>(certificatePolicy.X509CertificateProperties.Ekus),
ValidityInMonths = certificatePolicy.X509CertificateProperties == null ? null : certificatePolicy.X509CertificateProperties.ValidityInMonths,
IssuerName = certificatePolicy.IssuerReference == null ? null : certificatePolicy.IssuerReference.Name,
IssuerName = certificatePolicy.IssuerParameters == null ? null : certificatePolicy.IssuerParameters.Name,
CertificateType = certificatePolicy.IssuerParameters == null ? null : certificatePolicy.IssuerParameters.CertificateType,
RenewAtNumberOfDaysBeforeExpiry = certificatePolicy.LifetimeActions == null ? null : FindIntValueForAutoRenewAction(certificatePolicy.LifetimeActions, (trigger) => trigger.DaysBeforeExpiry),
RenewAtPercentageLifetime = certificatePolicy.LifetimeActions == null ? null : FindIntValueForAutoRenewAction(certificatePolicy.LifetimeActions, (trigger) => trigger.LifetimePercentage),
EmailAtNumberOfDaysBeforeExpiry = certificatePolicy.LifetimeActions == null ? null : FindIntValueForEmailAction(certificatePolicy.LifetimeActions, (trigger) => trigger.DaysBeforeExpiry),
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/KeyVault/Commands.KeyVault/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Graph.RBAC" version="3.2.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault" version="2.0.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault" version="2.0.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault.WebKey" version="2.0.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.KeyVault" version="2.0.0-preview" targetFramework="net45" />
Expand Down