Skip to content

Commit 221015a

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#4694 from prbansa/MarketplaceOrdering_CmdLets
Marketplace ordering Add Get/Set-AzureRmMarketplaceTerms Cmdlets
2 parents e5a9312 + 6c167fd commit 221015a

36 files changed

+2664
-3
lines changed

‎TestMappings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,8 @@
170170
],
171171
"src/ResourceManager/Profile/Commands.Profile.Test/": [
172172
".\\src\\ResourceManager\\Profile\\Commands.Profile.Test\\bin\\Debug\\Microsoft.Azure.Commands.Profile.Test.dll"
173+
],
174+
"src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/": [
175+
".\\src\\ResourceManager\\MarketplaceOrdering\\Commands.MarketplaceOrdering.Test\\bin\\Debug\\Microsoft.Azure.Commands.MarketplaceOrdering.Test.dll"
173176
]
174177
}

‎setup/azurecmdfiles.wxi

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2228,6 +2228,77 @@
22282228
<File Id="filE20DD5EF6A313DE42A8AFEF923D0006A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MachineLearningCompute\System.Net.Http.Primitives.dll" />
22292229
</Component>
22302230
</Directory>
2231+
<Directory Id="dirD7515C98365CCAF206E0B30DCEDDC46F" Name="AzureRM.MarketplaceOrdering">
2232+
<Component Id="cmp7A8866964515C9266836AE2727FC2772" Guid="*">
2233+
<File Id="filC019D3AE878C1D5DCD88B1619E8FA23C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\AzureRM.MarketplaceOrdering.psd1" />
2234+
</Component>
2235+
<Component Id="cmp0288996DAF3F5401E14AC034166AE89D" Guid="*">
2236+
<File Id="fil713A1AFA219BD6B114C9D652E014F08A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\AzureRM.MarketplaceOrdering.psm1" />
2237+
</Component>
2238+
<Component Id="cmp61A2F6BAE32D6B1610634661666B00EB" Guid="*">
2239+
<File Id="fil47AB96F186D0AB1AF53DBF6CE77DD0A6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Hyak.Common.dll" />
2240+
</Component>
2241+
<Component Id="cmp7B5D5FD680D26D30857427E36AAFA0DB" Guid="*">
2242+
<File Id="filD626E592F95AA9DF3EF53A4BE627002E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.ApplicationInsights.dll" />
2243+
</Component>
2244+
<Component Id="cmpD25AAE4E5D284F4849212C1BB5C53D35" Guid="*">
2245+
<File Id="filAE8B56AD5C2890AE398961ABE07587B8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll" />
2246+
</Component>
2247+
<Component Id="cmp0207800F580CB08D274BA341FAB3497A" Guid="*">
2248+
<File Id="fil7438EA28B0858C3A1828FB52383EBFD7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Azure.Commands.MarketplaceOrdering.dll" />
2249+
</Component>
2250+
<Component Id="cmpD7BAE7FE5CF6F216C224400B50C0476E" Guid="*">
2251+
<File Id="filA9E4AD9A99C8737A6A005410C2C64F1A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Azure.Commands.MarketplaceOrdering.dll-Help.xml" />
2252+
</Component>
2253+
<Component Id="cmpA935356DB49173BE632246C7D5831B87" Guid="*">
2254+
<File Id="fil543466169A8CDB4A63AFB0670B1A8974" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Azure.Commands.MarketplaceOrdering.Format.ps1xml" />
2255+
</Component>
2256+
<Component Id="cmp22F865481B4F65F5A7677100DDEBF80F" Guid="*">
2257+
<File Id="filEC1D7D16C113689C0A843237756CEE7F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
2258+
</Component>
2259+
<Component Id="cmp5119252ED0C2A2BE2FD9A40F7759876C" Guid="*">
2260+
<File Id="fil6EA832F67DEE31D85E1D0FCBF6DACFF8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Azure.Common.dll" />
2261+
</Component>
2262+
<Component Id="cmpE19137AF99446153F264315346D5ACF9" Guid="*">
2263+
<File Id="filF13CE76870E561534D549606FD94E55E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Azure.Common.NetFramework.dll" />
2264+
</Component>
2265+
<Component Id="cmp5658DC779093810166C1E866A46B525A" Guid="*">
2266+
<File Id="fil6F548E8FF468B2BB6F31A13FCFE5E4C7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Azure.KeyVault.Core.dll" />
2267+
</Component>
2268+
<Component Id="cmp0B219B795B27D0020436AB75FDD47657" Guid="*">
2269+
<File Id="filFADF2FB4D6555845E3CAE87E7F9D590E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Azure.Management.MarketplaceOrdering.dll" />
2270+
</Component>
2271+
<Component Id="cmp239156866D83EA61E306D8CEB128E35A" Guid="*">
2272+
<File Id="fil92AE1C056FE885D18A128AC6F2C6E746" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Rest.ClientRuntime.Azure.dll" />
2273+
</Component>
2274+
<Component Id="cmpA413E34218C4CFC49AE114304A4379BA" Guid="*">
2275+
<File Id="fil3F4E038904A5FEB75756D0C83E73E7F9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Rest.ClientRuntime.dll" />
2276+
</Component>
2277+
<Component Id="cmpC05761AA9DE37C0BFFA50F1F05B5E33E" Guid="*">
2278+
<File Id="filEAF01F822B8A9AF891D30E045BCD2390" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Threading.Tasks.dll" />
2279+
</Component>
2280+
<Component Id="cmpE9CD6EC2170ACB1824348A31FFE2DEBE" Guid="*">
2281+
<File Id="fil7B8FF398F51E631E69B6FDD2EAE6CA12" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
2282+
</Component>
2283+
<Component Id="cmp74E1A1B78DCC1B5CAC1C016AC8FF7F28" Guid="*">
2284+
<File Id="fil0B1C9FC4584F04641FA15BF2CA14803F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.Threading.Tasks.Extensions.dll" />
2285+
</Component>
2286+
<Component Id="cmpF27DABF6428E1FEFEEE75ADEFDA5FC15" Guid="*">
2287+
<File Id="filA3E385C037620E946B184031B109DE8E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.WindowsAzure.Commands.Common.dll" />
2288+
</Component>
2289+
<Component Id="cmp61B020B40B618B5F16BAF76A4C1CF314" Guid="*">
2290+
<File Id="fil0750CCE8480307C52ED64F1F57303D0D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Microsoft.WindowsAzure.Management.dll" />
2291+
</Component>
2292+
<Component Id="cmp88F579888E43968FB7AFCCCBE81E6929" Guid="*">
2293+
<File Id="fil3F702777879AAB109981430F13FD7194" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\Newtonsoft.Json.dll" />
2294+
</Component>
2295+
<Component Id="cmpB9A8F2F55BB5640D7047601664F781A2" Guid="*">
2296+
<File Id="filFB4F173DBFB2151DF43723CA4940AE64" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\System.Net.Http.Extensions.dll" />
2297+
</Component>
2298+
<Component Id="cmp62347C1BF1D9ADFC623D5F2A8372CA4C" Guid="*">
2299+
<File Id="filA98CDF60192491C9E8711DA5B979A22F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MarketplaceOrdering\System.Net.Http.Primitives.dll" />
2300+
</Component>
2301+
</Directory>
22312302
<Directory Id="dirCB0C047DD4181DECD8246B00896D9DEB" Name="AzureRM.Media">
22322303
<Component Id="cmp6FD3249008BE1CA9554B0CF205468ECC" Guid="*">
22332304
<File Id="filC9AF0C225F606A630DAE236D5A762C79" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\AzureRM.Media.psd1" />
@@ -6537,6 +6608,29 @@
65376608
<ComponentRef Id="cmpA61F304B5D6623DCFF217C94B36239AB" />
65386609
<ComponentRef Id="cmp3AB04474DF31FAC55BB1D00AAACF3099" />
65396610
<ComponentRef Id="cmp0DA3AE2BCB8C66B734D8E9B304FDD7D1" />
6611+
<ComponentRef Id="cmp7A8866964515C9266836AE2727FC2772" />
6612+
<ComponentRef Id="cmp0288996DAF3F5401E14AC034166AE89D" />
6613+
<ComponentRef Id="cmp61A2F6BAE32D6B1610634661666B00EB" />
6614+
<ComponentRef Id="cmp7B5D5FD680D26D30857427E36AAFA0DB" />
6615+
<ComponentRef Id="cmpD25AAE4E5D284F4849212C1BB5C53D35" />
6616+
<ComponentRef Id="cmp0207800F580CB08D274BA341FAB3497A" />
6617+
<ComponentRef Id="cmpD7BAE7FE5CF6F216C224400B50C0476E" />
6618+
<ComponentRef Id="cmpA935356DB49173BE632246C7D5831B87" />
6619+
<ComponentRef Id="cmp22F865481B4F65F5A7677100DDEBF80F" />
6620+
<ComponentRef Id="cmp5119252ED0C2A2BE2FD9A40F7759876C" />
6621+
<ComponentRef Id="cmpE19137AF99446153F264315346D5ACF9" />
6622+
<ComponentRef Id="cmp5658DC779093810166C1E866A46B525A" />
6623+
<ComponentRef Id="cmp0B219B795B27D0020436AB75FDD47657" />
6624+
<ComponentRef Id="cmp239156866D83EA61E306D8CEB128E35A" />
6625+
<ComponentRef Id="cmpA413E34218C4CFC49AE114304A4379BA" />
6626+
<ComponentRef Id="cmpC05761AA9DE37C0BFFA50F1F05B5E33E" />
6627+
<ComponentRef Id="cmpE9CD6EC2170ACB1824348A31FFE2DEBE" />
6628+
<ComponentRef Id="cmp74E1A1B78DCC1B5CAC1C016AC8FF7F28" />
6629+
<ComponentRef Id="cmpF27DABF6428E1FEFEEE75ADEFDA5FC15" />
6630+
<ComponentRef Id="cmp61B020B40B618B5F16BAF76A4C1CF314" />
6631+
<ComponentRef Id="cmp88F579888E43968FB7AFCCCBE81E6929" />
6632+
<ComponentRef Id="cmpB9A8F2F55BB5640D7047601664F781A2" />
6633+
<ComponentRef Id="cmp62347C1BF1D9ADFC623D5F2A8372CA4C" />
65406634
<ComponentRef Id="cmp6FD3249008BE1CA9554B0CF205468ECC" />
65416635
<ComponentRef Id="cmp2CDE3382CBE83DEF253156256822F049" />
65426636
<ComponentRef Id="cmp990FBAE4CED884C255B3B411FE048F5C" />

‎src/ResourceManager/MarketplaceOrdering/AzureRM.MarketplaceOrdering.psd1

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
#
2+
# Module manifest for module 'PSGet_AzureRM.MarketplaceOrdering'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 9/14/2017
7+
#
8+
9+
@{
10+
11+
# Script module or binary module file associated with this manifest.
12+
# RootModule = ''
13+
14+
# Version number of this module.
15+
ModuleVersion = '0.1.0'
16+
17+
# Supported PSEditions
18+
# CompatiblePSEditions = @()
19+
20+
# ID used to uniquely identify this module
21+
GUID = '6e0e216b-1dff-4992-b943-b3a4f14679ab'
22+
23+
# Author of this module
24+
Author = 'Microsoft Corporation'
25+
26+
# Company or vendor of this module
27+
CompanyName = 'Microsoft Corporation'
28+
29+
# Copyright statement for this module
30+
Copyright = 'Microsoft Corporation. All rights reserved.'
31+
32+
# Description of the functionality provided by this module
33+
Description = 'Microsoft Azure PowerShell - MarketplaceOrdering agreements service cmdlets for Azure Resource Manager'
34+
35+
# Minimum version of the Windows PowerShell engine required by this module
36+
PowerShellVersion = '3.0'
37+
38+
# Name of the Windows PowerShell host required by this module
39+
# PowerShellHostName = ''
40+
41+
# Minimum version of the Windows PowerShell host required by this module
42+
# PowerShellHostVersion = ''
43+
44+
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45+
DotNetFrameworkVersion = '4.5.2'
46+
47+
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48+
CLRVersion = '4.0'
49+
50+
# Processor architecture (None, X86, Amd64) required by this module
51+
# ProcessorArchitecture = ''
52+
53+
# Modules that must be imported into the global environment prior to importing this module
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.4.1'; })
55+
56+
# Assemblies that must be loaded prior to importing this module
57+
# RequiredAssemblies = @()
58+
59+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
60+
# ScriptsToProcess = @()
61+
62+
# Type files (.ps1xml) to be loaded when importing this module
63+
# TypesToProcess = @()
64+
65+
# Format files (.ps1xml) to be loaded when importing this module
66+
FormatsToProcess = '.\Microsoft.Azure.Commands.MarketplaceOrdering.Format.ps1xml'
67+
68+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69+
NestedModules = @('.\Microsoft.Azure.Commands.MarketplaceOrdering.dll')
70+
71+
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
72+
FunctionsToExport = @()
73+
74+
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
75+
CmdletsToExport = 'Get-AzureRmMarketplaceTerms', 'Set-AzureRmMarketplaceTerms'
76+
77+
# Variables to export from this module
78+
# VariablesToExport = @()
79+
80+
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
81+
AliasesToExport = @()
82+
83+
# DSC resources to export from this module
84+
# DscResourcesToExport = @()
85+
86+
# List of all modules packaged with this module
87+
# ModuleList = @()
88+
89+
# List of all files packaged with this module
90+
# FileList = @()
91+
92+
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
93+
PrivateData = @{
94+
95+
PSData = @{
96+
97+
# Tags applied to this module. These help with module discovery in online galleries.
98+
Tags = 'Azure','ResourceManager','ARM','MarketplaceOrdering'
99+
100+
# A URL to the license for this module.
101+
LicenseUri = 'https://aka.ms/azps-license'
102+
103+
# A URL to the main website for this project.
104+
ProjectUri = 'https://github.com/Azure/azure-powershell'
105+
106+
# A URL to an icon representing this module.
107+
# IconUri = ''
108+
109+
# ReleaseNotes of this module
110+
ReleaseNotes = 'Updated for common code changes'
111+
112+
# External dependent modules of this module
113+
# ExternalModuleDependencies = ''
114+
115+
} # End of PSData hashtable
116+
117+
} # End of PrivateData hashtable
118+
119+
# HelpInfo URI of this module
120+
# HelpInfoURI = ''
121+
122+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
123+
# DefaultCommandPrefix = ''
124+
125+
}
126+

‎src/ResourceManager/MarketplaceOrdering/ChangeLog.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!--
2+
Please leave this section at the top of the change log.
3+
4+
Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
5+
6+
## Current Release
7+
* Overview of change #1
8+
- Additional information about change #1
9+
* Overview of change #2
10+
- Additional information about change #2
11+
- Additional information about change #2
12+
* Overview of change #3
13+
* Overview of change #4
14+
- Additional information about change #4
15+
16+
## YYYY.MM.DD - Version X.Y.Z (Previous Release)
17+
* Overview of change #1
18+
- Additional information about change #1
19+
-->
20+
## Current Release
21+
* New Cmdlet Get-AzureRmMarketplaceTerms
22+
- Get the agreement terms of a given publisher id, offer id and plan id.
23+
* New Cmdlet Set-AzureRmMarketplaceTerms
24+
- Accept or reject agreement terms of a give publisher id, offer id and plan id. Please use Get-AzureRmMarketplaceTerms to get the agreement terms.

0 commit comments

Comments
 (0)