Skip to content

feat(Workspace): Add new SkuType for Workspace #28903

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
solankisamir merged 6 commits into from
May 17, 2024
Merged

feat(Workspace): Add new SkuType for Workspace #28903

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f946a4b
new skutype
solankisamir Apr 30, 2024
a7bb272
virtualNetworkType
solankisamir May 6, 2024
fe1461c
remove default from patch
solankisamir May 6, 2024
c52b326
List skus API
solankisamir May 8, 2024
e2dd2a2
add model for sku
solankisamir May 9, 2024
55d927f
caps enums
solankisamir May 11, 2024
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
Prev Previous commit
Next Next commit
virtualNetworkType
  • Loading branch information
@solankisamir
solankisamir committed May 6, 2024
commit a7bb272cf781446f6681e9ba5861e1e642cf038a
56 changes: 52 additions & 4 deletions ...ement/resource-manager/Microsoft.ApiManagement/preview/2023-09-01-preview/apigateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,15 +347,15 @@
"values": [
{
"value": "Standard",
"description": "Standard SKU of the API gateway."
"description": "Standard SKU of the API gateway."
},
{
"value": "WorkspaceGatewayStandard",
"description": "Standard SKU of the API gateway to be used in Workspaces."
},
{
"value": "WorkspaceGatewayPremium",
"description": "Standard SKU of the API gateway to be used in Workspaces."
"description": "Premium SKU of the API gateway to be used in Workspaces."
}
]
}
Expand Down Expand Up @@ -455,6 +455,34 @@
"configurationApi": {
"$ref": "#/definitions/GatewayConfigurationApi",
"description": "Information regarding the Configuration API of the API Management gateway. This is only applicable for API gateway with Standard SKU."
},
"virtualNetworkType": {
"type": "string",
"description": "The type of VPN in which API Management gateway needs to be configured in. ",
"default": "None",
"enum": [
"None",
"External",
"Internal"
],
"x-ms-enum": {
"name": "VirtualNetworkType",
"modelAsString": true,
"values": [
{
"value": "None",
"description": "The API Management gateway is not part of any Virtual Network."
},
{
"value": "External",
"description": "The API Management gateway is part of Virtual Network and it is accessible from Internet."
},
{
"value": "Internal",
"description": "The API Management gateway is part of Virtual Network and it is only accessible from within the virtual network."
}
]
}
}
},
"description": "Base Properties of an API Management gateway resource description."
Expand Down Expand Up @@ -489,7 +517,9 @@
"url": "https://azure.microsoft.com/en-us/pricing/details/api-management/"
},
"enum": [
"Standard"
"Standard",
"WorkspaceGatewayStandard",
"WorkspaceGatewayPremium"
],
"x-ms-enum": {
"name": "SkuType",
Expand All @@ -498,6 +528,14 @@
{
"value": "Standard",
"description": "Standard SKU of the API gateway."
},
{
"value": "WorkspaceGatewayStandard",
"description": "Standard SKU of the API gateway to be used in Workspaces."
},
{
"value": "WorkspaceGatewayPremium",
"description": "Premium SKU of the API gateway to be used in Workspaces."
}
]
}
Expand All @@ -523,7 +561,9 @@
"url": "https://azure.microsoft.com/en-us/pricing/details/api-management/"
},
"enum": [
"Standard"
"Standard",
"WorkspaceGatewayStandard",
"WorkspaceGatewayPremium"
],
"x-ms-enum": {
"name": "SkuType",
Expand All @@ -532,6 +572,14 @@
{
"value": "Standard",
"description": "Standard SKU of the API gateway."
},
{
"value": "WorkspaceGatewayStandard",
"description": "Standard SKU of the API gateway to be used in Workspaces."
},
{
"value": "WorkspaceGatewayPremium",
"description": "Premium SKU of the API gateway to be used in Workspaces."
}
]
}
Expand Down
13 changes: 8 additions & 5 deletions ...ement/preview/2023-09-01-preview/examples/ApiManagementCreateWorkspacePremiumGateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"subnet": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/sn1"
}
}
},
"virtualNetworkType": "External"
},
"sku": {
"name": "WorkspaceGatewayPremium",
Expand Down Expand Up @@ -46,10 +47,11 @@
"subnet": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/sn1"
}
}
},
"virtualNetworkType": "External"
},
"sku": {
"name": "Standard",
"name": "WorkspaceGatewayPremium",
"capacity": 1
},
"systemData": {
Expand Down Expand Up @@ -80,10 +82,11 @@
"subnet": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/sn1"
}
}
},
"virtualNetworkType": "External"
},
"sku": {
"name": "Standard",
"name": "WorkspaceGatewayPremium",
"capacity": 1
},
"systemData": {
Expand Down
21 changes: 5 additions & 16 deletions ...nagement/preview/2023-09-01-preview/examples/ApiManagementListGatewaysBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,32 +47,21 @@
}
},
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg2/providers/Microsoft.ApiManagement/gateways/standard-gw-2",
"name": "standard-gw-2",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg2/providers/Microsoft.ApiManagement/gateways/workspace-gw-2",
"name": "workspace-gw-2",
"type": "Microsoft.ApiManagement/gateways",
"tags": {
"Owner": "vitaliik"
"Owner": "foo"
},
"location": "East US",
"etag": "AAAAAAAWKwo=",
"properties": {
"provisioningState": "Succeeded",
"targetProvisioningState": "",
"createdAtUtc": "2021-06-16T09:40:00.9453556Z",
"frontend": {
"defaultHostname": "standard-gw-2.eastus.gateway.azure-api.net"
},
"backend": {
"subnet": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn2/subnets/sn2"
}
},
"configurationApi": {
"hostname": "standard-gw-2.eastus.configuration.gateway.azure-api.net"
}
"createdAtUtc": "2021-06-16T09:40:00.9453556Z"
},
"sku": {
"name": "Standard",
"name": "WorkspaceGatewayPremium",
"capacity": 1
}
}
Expand Down