diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotAlertTypes.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotAlertTypes.json index a1dd8e2d4361..3154528920cc 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotAlertTypes.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotAlertTypes.json @@ -45,7 +45,7 @@ "IoT Security Alert Types" ], "description": "List IoT alert types", - "operationId": "IotAlertTypes_List", + "operationId": "IotAlertTypes_ListAtSubscriptionScope", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -80,7 +80,7 @@ "tags": [ "IoT Security Alert Types" ], - "operationId": "IotAlertTypes_Get", + "operationId": "IotAlertTypes_GetAtSubscriptionScope", "description": "Get IoT alert type", "parameters": [ { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotAlerts.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotAlerts.json index 3c6af28c9e93..821768b0b2df 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotAlerts.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotAlerts.json @@ -45,7 +45,7 @@ "IoT Security Alerts" ], "description": "List IoT alerts", - "operationId": "IotAlerts_List", + "operationId": "IotAlerts_ListAtScope", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -143,7 +143,7 @@ "tags": [ "IoT Security Alerts" ], - "operationId": "IotAlerts_Get", + "operationId": "IotAlerts_GetAtScope", "description": "Get IoT alert", "parameters": [ { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotRecommendationTypes.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotRecommendationTypes.json index 9299fa3006e2..187af4bb611d 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotRecommendationTypes.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotRecommendationTypes.json @@ -45,7 +45,7 @@ "IoT Security Recommendation Types" ], "description": "List IoT recommendation types", - "operationId": "IotRecommendationTypes_List", + "operationId": "IotRecommendationTypes_ListAtSubscriptionScope", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -80,7 +80,7 @@ "tags": [ "IoT Security Recommendation Types" ], - "operationId": "IotRecommendationTypes_Get", + "operationId": "IotRecommendationTypes_GetAtSubscriptionScope", "description": "Get IoT recommendation type", "parameters": [ { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotRecommendations.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotRecommendations.json index 325bc059bf72..a5846e3594fb 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotRecommendations.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotRecommendations.json @@ -45,7 +45,7 @@ "IoT Security Recommendations" ], "description": "List IoT recommendations", - "operationId": "IotRecommendations_List", + "operationId": "IotRecommendations_ListAtScope", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -112,7 +112,7 @@ "tags": [ "IoT Security Recommendations" ], - "operationId": "IotRecommendations_Get", + "operationId": "IotRecommendations_GetAtScope", "description": "Get IoT recommendation", "parameters": [ { diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 09c6332c1981..d0107f73fb69 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -446,6 +446,7 @@ swagger-to-sdk: - repo: azure-sdk-for-net - repo: azure-sdk-for-go - repo: azure-sdk-for-python + - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-js - repo: azure-sdk-for-node - repo: azure-resource-manager-schemas diff --git a/specification/security/resource-manager/readme.python.md b/specification/security/resource-manager/readme.python.md index 46bfb3c58b8f..3b0186164cff 100644 --- a/specification/security/resource-manager/readme.python.md +++ b/specification/security/resource-manager/readme.python.md @@ -4,7 +4,7 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml $(python) +``` yaml $(python) && !$(track2) python-mode: create python: azure-arm: true @@ -15,13 +15,149 @@ python: package-version: 0.1.0 clear-output-folder: true ``` -``` yaml $(python) && $(python-mode) == 'update' + +``` yaml $(python) && $(track2) +python-mode: create +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +namespace: azure.mgmt.security +package-name: azure-mgmt-security +package-version: 1.0.0b1 +clear-output-folder: true + + +``` + +``` yaml $(python) && $(python-mode) == 'update' && !$(track2) python: no-namespace-folders: true output-folder: $(python-sdks-folder)/security/azure-mgmt-security/azure/mgmt/security ``` -``` yaml $(python) && $(python-mode) == 'create' + +``` yaml $(python) && $(python-mode) == 'update' && $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/security/azure-mgmt-security/azure/mgmt/security +``` + +``` yaml $(python) && $(python-mode) == 'create' && !$(track2) python: basic-setup-py: true output-folder: $(python-sdks-folder)/security/azure-mgmt-security ``` + +``` yaml $(python) && $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/security/azure-mgmt-security +``` + +```yaml $(python) && $(track2) +directive: + - from: jitNetworkAccessPolicies.json + where: $.definitions.JitNetworkAccessPortRule.properties + transform: > + return { + "number": { + "$ref": "#/definitions/PortNumber" + }, + "protocol": { + "type": "string", + "enum": [ + "TCP", + "UDP", + "*" + ], + "x-ms-enum": { + "name": "protocolEnum", + "modelAsString": true, + "values": [ + { + "value": "TCP" + }, + { + "value": "UDP" + }, + { + "value": "*", + "name": "All" + } + ] + } + }, + "allowedSourceAddressPrefix": { + "type": "string", + "description": "Mutually exclusive with the \"allowedSourceAddressPrefixes\" parameter. Should be an IP address or CIDR, for example \"192.168.0.3\" or \"192.168.0.0/16\"." + }, + "allowedSourceAddressPrefixes": { + "type": "array", + "description": "Mutually exclusive with the \"allowedSourceAddressPrefix\" parameter.", + "items": { + "type": "string", + "description": "IP address or CIDR, for example \"192.168.0.3\" or \"192.168.0.0/16\"." + } + }, + "maxRequestAccessDuration": { + "type": "string", + "description": "Maximum duration requests can be made for. In ISO 8601 duration format. Minimum 5 minutes, maximum 1 day" + } + } + + - from: externalSecuritySolutions.json + where: $.definitions.ExternalSecuritySolutionKind.properties + transform: > + return { + "kind": { + "type": "string", + "description": "The kind of the external solution", + "enum": [ + "CEF", + "ATA", + "AAD" + ], + "x-ms-enum": { + "name": "ExternalSecuritySolutionKindEnum", + "modelAsString": true, + "values": [ + { + "value": "CEF" + }, + { + "value": "ATA" + }, + { + "value": "AAD" + } + ] + } + } + } + + - from: externalSecuritySolutions.json + where: $.definitions.AadConnectivityState.properties + transform: > + return { + "connectivityState": { + "type": "string", + "title": "The connectivity state of the external AAD solution ", + "enum": [ + "Discovered", + "NotLicensed", + "Connected" + ], + "x-ms-enum": { + "name": "AadConnectivityStateEnum", + "modelAsString": true, + "values": [ + { + "value": "Discovered" + }, + { + "value": "NotLicensed" + }, + { + "value": "Connected" + } + ] + } + } + } +```