Skip to content

Commit

Permalink
Add Api Management Basic Sku (#2076)
Browse files Browse the repository at this point in the history 
* Basic Sku

* Update Enums which can change to modelAsString true
  • Loading branch information
@solankisamir @fearthecowboy
solankisamir authored and fearthecowboy committed Dec 7, 2017
1 parent e2be3ff commit 5d08adc
Show file tree
Hide file tree
Showing 7 changed files with 209 additions and 20 deletions.
32 changes: 29 additions & 3 deletions ...ification/apimanagement/resource-manager/Microsoft.ApiManagement/2017-03-01/apimapis.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@
],
"x-ms-enum": {
"name": "ExportFormat",
"modelAsString": false,
"modelAsString": true,
"values": [
{
"value": "application/vnd.swagger.link+json",
Expand Down Expand Up @@ -1527,7 +1527,33 @@
],
"x-ms-enum": {
"name": "ContentFormat",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "wadl-xml",
"description": "The contents are inline and Content type is a WADL document."
},
{
"value": "wadl-link-json",
"description": "The WADL document is hosted on a publicly accessible internet address."
},
{
"value": "swagger-json",
"description": "The contents are inline and Content Type if a OpenApi 2.0 Document."
},
{
"value": "swagger-link-json",
"description": "The Open Api 2.0 document is hosted on a publicly accessible internet address."
},
{
"value": "wsdl",
"description": "The contents are inline and the document is a WSDL/Soap document."
},
{
"value": "wsdl-link",
"description": "The WSDL document is hosted on a publicly accessible internet address."
}
]
}
},
"wsdlSelector": {
Expand Down Expand Up @@ -1638,7 +1664,7 @@
],
"x-ms-enum": {
"name": "Protocol",
"modelAsString": false
"modelAsString": true
}
},
"description": "Describes on which protocols the operations in this API can be invoked."
Expand Down
54 changes: 50 additions & 4 deletions ...agement/resource-manager/Microsoft.ApiManagement/2017-03-01/apimauthorizationservers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,25 @@
],
"x-ms-enum": {
"name": "GrantType",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "authorizationCode",
"description": "Authorization Code Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.1."
},
{
"value": "implicit",
"description": "Implicit Code Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.2."
},
{
"value": "resourceOwnerPassword",
"description": "Resource Owner Password Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.3."
},
{
"value": "clientCredentials",
"description": "Client Credentials Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.4."
}
]
}
},
"description": "Form of an authorization grant, which the client uses to request the access token.",
Expand Down Expand Up @@ -435,7 +453,25 @@
],
"x-ms-enum": {
"name": "GrantType",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "authorizationCode",
"description": "Authorization Code Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.1."
},
{
"value": "implicit",
"description": "Implicit Code Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.2."
},
{
"value": "resourceOwnerPassword",
"description": "Resource Owner Password Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.3."
},
{
"value": "clientCredentials",
"description": "Client Credentials Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.4."
}
]
}
},
"description": "Form of an authorization grant, which the client uses to request the access token.",
Expand Down Expand Up @@ -492,7 +528,17 @@
],
"x-ms-enum": {
"name": "ClientAuthenticationMethod",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "Basic",
"description": "Basic Client Authentication method."
},
{
"value": "Body",
"description": "Body based Authentication method."
}
]
}
},
"description": "Method of authentication supported by the token endpoint of this authorization server. Possible values are Basic and/or Body. When Body is specified, client credentials and other parameters are passed within the request body in the application/x-www-form-urlencoded format."
Expand Down Expand Up @@ -535,7 +581,7 @@
],
"x-ms-enum": {
"name": "BearerTokenSendingMethod",
"modelAsString": false
"modelAsString": true
}
},
"description": "Specifies the mechanism by which access token is passed to the API. ",
Expand Down
24 changes: 22 additions & 2 deletions ...ation/apimanagement/resource-manager/Microsoft.ApiManagement/2017-03-01/apimbackends.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,17 @@
],
"x-ms-enum": {
"name": "BackendProtocol",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "http",
"description": "The Backend is a RESTful service."
},
{
"value": "soap",
"description": "The Backend is a SOAP service."
}
]
},
"description": "Backend communication protocol."
}
Expand Down Expand Up @@ -601,7 +611,17 @@
],
"x-ms-enum": {
"name": "BackendProtocol",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "http",
"description": "The Backend is a RESTful service."
},
{
"value": "soap",
"description": "The Backend is a SOAP service."
}
]
},
"description": "Backend communication protocol."
}
Expand Down
41 changes: 37 additions & 4 deletions ...ion/apimanagement/resource-manager/Microsoft.ApiManagement/2017-03-01/apimdeployment.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,21 @@
],
"x-ms-enum": {
"name": "VirtualNetworkType",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "None",
"description": "The service is not part of any Virtual Network."
},
{
"value": "External",
"description": "The service is part of Virtual Network and it is accessible from Internet."
},
{
"value": "Internal",
"description": "The service is part of Virtual Network and it is only accessible from within the virtual network."
}
]
}
}
},
Expand All @@ -981,11 +995,30 @@
"enum": [
"Developer",
"Standard",
"Premium"
"Premium",
"Basic"
],
"x-ms-enum": {
"name": "SkuType",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "Developer",
"description": "Developer SKU of Api Management."
},
{
"value": "Standard",
"description": "Standard SKU of Api Management."
},
{
"value": "Premium",
"description": "Premium SKU of Api Management."
},
{
"value": "Basic",
"description": "Basic SKU of Api Management."
}
]
}
},
"capacity": {
Expand Down Expand Up @@ -1217,7 +1250,7 @@
],
"x-ms-enum": {
"name": "ApimIdentityType",
"modelAsString": false
"modelAsString": true
}
},
"principalId": {
Expand Down
56 changes: 54 additions & 2 deletions ...imanagement/resource-manager/Microsoft.ApiManagement/2017-03-01/apimidentityprovider.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,33 @@
],
"x-ms-enum": {
"name": "IdentityProviderType",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "facebook",
"description": "Facebook as Identity provider."
},
{
"value": "google",
"description": "Google as Identity provider."
},
{
"value": "microsoft",
"description": "Microsoft Live as Identity provider."
},
{
"value": "twitter",
"description": "Twitter as Identity provider."
},
{
"value": "aad",
"description": "Azure Active Directory as Identity provider."
},
{
"value": "aadB2C",
"description": "Azure Active Directory B2C as Identity provider."
}
]
},
"description": "Identity Provider Type identifier."
},
Expand Down Expand Up @@ -444,7 +470,33 @@
],
"x-ms-enum": {
"name": "IdentityProviderType",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "facebook",
"description": "Facebook as Identity provider."
},
{
"value": "google",
"description": "Google as Identity provider."
},
{
"value": "microsoft",
"description": "Microsoft Live as Identity provider."
},
{
"value": "twitter",
"description": "Twitter as Identity provider."
},
{
"value": "aad",
"description": "Azure Active Directory as Identity provider."
},
{
"value": "aadB2C",
"description": "Azure Active Directory B2C as Identity provider."
}
]
},
"description": "Identity Provider Type identifier.",
"x-ms-parameter-location": "method"
Expand Down
20 changes: 16 additions & 4 deletions ...cation/apimanagement/resource-manager/Microsoft.ApiManagement/2017-03-01/apimloggers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,13 @@
],
"x-ms-enum": {
"name": "LoggerType",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "azureEventHub",
"description": "Azure Event Hub as log destination."
}
]
}
},
"description": {
Expand All @@ -377,7 +383,7 @@
},
"isBuffered": {
"type": "boolean",
"description": "Whether records are buffered in the logger before publishing. Default is assumed to be true."
"description": "Whether records are buffered in the logger before publishing. Default is assumed to be true."
}
},
"required": [
Expand Down Expand Up @@ -406,7 +412,13 @@
],
"x-ms-enum": {
"name": "LoggerType",
"modelAsString": false
"modelAsString": true,
"values": [
{
"value": "azureEventHub",
"description": "Azure Event Hub as log destination."
}
]
}
},
"description": {
Expand All @@ -422,7 +434,7 @@
},
"isBuffered": {
"type": "boolean",
"description": "Whether records are buffered in the logger before publishing. Default is assumed to be true."
"description": "Whether records are buffered in the logger before publishing. Default is assumed to be true."
}
},
"description": "Parameters supplied to the Update Logger operation."
Expand Down
2 changes: 1 addition & 1 deletion ...fication/apimanagement/resource-manager/Microsoft.ApiManagement/2017-03-01/apimusers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@
"default": "active",
"x-ms-enum": {
"name": "UserState",
"modelAsString": false
"modelAsString": true
}
},
"note": {
Expand Down

0 comments on commit 5d08adc

Please sign in to comment.