From eaf464ee6a5803e1d1b0e16ede4e5af15efc0b25 Mon Sep 17 00:00:00 2001 From: Elia Grady Date: Mon, 12 Nov 2018 20:34:55 +0200 Subject: [PATCH] Remove security contact phone field mandatory fields (#4417) * Remove security contact phone field mandatory fields * Update security contact examples * Update security contact examples - refactored * Update security contact examples - refactored - second iteration --- ...> CreateSecurityContact_full_example.json} | 10 +++--- .../CreateSecurityContact_min_example.json | 31 +++++++++++++++++++ .../DeleteSecurityContact_example.json | 2 +- ...n => GetSecurityContact_full_example.json} | 6 ++-- .../GetSecurityContact_min_example.json | 21 +++++++++++++ ...ityContactsSubscription_full_example.json} | 4 +-- ...urityContactsSubscription_min_example.json | 22 +++++++++++++ ...> UpdateSecurityContact_full_example.json} | 8 ++--- .../UpdateSecurityContact_min_example.json | 29 +++++++++++++++++ .../preview/2017-08-01-preview/security.json | 29 +++++++++++------ 10 files changed, 138 insertions(+), 24 deletions(-) rename specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/{CreateSecurityContact_example.json => CreateSecurityContact_full_example.json} (77%) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_min_example.json rename specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/{GetSecurityContact_example.json => GetSecurityContact_full_example.json} (77%) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_min_example.json rename specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/{GetSecurityContactsSubscription_example.json => GetSecurityContactsSubscription_full_example.json} (83%) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_min_example.json rename specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/{UpdateSecurityContact_example.json => UpdateSecurityContact_full_example.json} (80%) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_min_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_full_example.json similarity index 77% rename from specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_full_example.json index 9deda54049f1..d4364254de7e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_full_example.json @@ -2,10 +2,10 @@ "parameters": { "api-version": "2017-08-01-preview", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "securityContactName": "john", + "securityContactName": "default1", "securityContact": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john", - "name": "john", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default1", + "name": "default1", "type": "Microsoft.Security/securityContacts", "properties": { "email": "john@contoso.com", @@ -18,8 +18,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john", - "name": "john", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default1", + "name": "default1", "type": "Microsoft.Security/securityContacts", "properties": { "email": "john@contoso.com", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_min_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_min_example.json new file mode 100644 index 000000000000..b5930c33de0f --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_min_example.json @@ -0,0 +1,31 @@ +{ + "parameters": { + "api-version": "2017-08-01-preview", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "securityContactName": "default2", + "securityContact": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default2", + "name": "default2", + "type": "Microsoft.Security/securityContacts", + "properties": { + "email": "chen@contoso.com", + "alertNotifications": "On", + "alertsToAdmins": "On" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default2", + "name": "default2", + "type": "Microsoft.Security/securityContacts", + "properties": { + "email": "chen@contoso.com", + "alertNotifications": "On", + "alertsToAdmins": "On" + } + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/DeleteSecurityContact_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/DeleteSecurityContact_example.json index 948df8317165..3533a29ff0fd 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/DeleteSecurityContact_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/DeleteSecurityContact_example.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2017-08-01-preview", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "securityContactName": "john" + "securityContactName": "default1" }, "responses": { "204": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_full_example.json similarity index 77% rename from specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_full_example.json index fcc0762de7c6..1b9c0f270c57 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_full_example.json @@ -2,13 +2,13 @@ "parameters": { "api-version": "2017-08-01-preview", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "securityContactName": "john" + "securityContactName": "default1" }, "responses": { "200": { "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john", - "name": "john", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default1", + "name": "default1", "type": "Microsoft.Security/securityContacts", "properties": { "email": "john@contoso.com", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_min_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_min_example.json new file mode 100644 index 000000000000..28acce3b9eda --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_min_example.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "api-version": "2017-08-01-preview", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "securityContactName": "default2" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default2", + "name": "default2", + "type": "Microsoft.Security/securityContacts", + "properties": { + "email": "chen@contoso.com", + "alertNotifications": "On", + "alertsToAdmins": "On" + } + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_full_example.json similarity index 83% rename from specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_full_example.json index 514a72a545d1..ee3783208a2f 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_full_example.json @@ -7,8 +7,8 @@ "200": { "body": { "value": [{ - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john", - "name": "john", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default1", + "name": "default1", "type": "Microsoft.Security/securityContacts", "properties": { "email": "john@contoso.com", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_min_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_min_example.json new file mode 100644 index 000000000000..60e5de6ae2f6 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_min_example.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "api-version": "2017-08-01-preview", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23" + }, + "responses": { + "200": { + "body": { + "value": [{ + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default2", + "name": "default2", + "type": "Microsoft.Security/securityContacts", + "properties": { + "email": "chen@contoso.com", + "alertNotifications": "On", + "alertsToAdmins": "On" + } + }] + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_full_example.json similarity index 80% rename from specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_full_example.json index 1de75b59b395..41505d376402 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_full_example.json @@ -4,8 +4,8 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "securityContactName": "john", "securityContact": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john", - "name": "john", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default1", + "name": "default1", "type": "Microsoft.Security/securityContacts", "properties": { "phone": "(214)275-4038", @@ -16,8 +16,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john", - "name": "john", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default1", + "name": "default1", "type": "Microsoft.Security/securityContacts", "properties": { "email": "john@contoso.com", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_min_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_min_example.json new file mode 100644 index 000000000000..ab4168075c92 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_min_example.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "api-version": "2017-08-01-preview", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "securityContactName": "default2", + "securityContact": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default2", + "name": "default2", + "type": "Microsoft.Security/securityContacts", + "properties": { + "alertNotifications": "On" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/default2", + "name": "default2", + "type": "Microsoft.Security/securityContacts", + "properties": { + "email": "chen@contoso.com", + "alertNotifications": "On", + "alertsToAdmins": "Off" + } + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/security.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/security.json index eb58fbb0d8a1..b01420e8dc9c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/security.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/security.json @@ -235,8 +235,11 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Security/securityContacts": { "get": { "x-ms-examples": { - "Update security contact data": { - "$ref": "./examples/SecurityContacts/GetSecurityContactsSubscription_example.json" + "Update security contact data minimal": { + "$ref": "./examples/SecurityContacts/GetSecurityContactsSubscription_min_example.json" + }, + "Update security contact data full": { + "$ref": "./examples/SecurityContacts/GetSecurityContactsSubscription_full_example.json" } }, "tags": ["Security Contacts"], @@ -269,8 +272,11 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Security/securityContacts/{securityContactName}": { "get": { "x-ms-examples": { - "Get security contact data": { - "$ref": "./examples/SecurityContacts/GetSecurityContact_example.json" + "Get security contact data minimal": { + "$ref": "./examples/SecurityContacts/GetSecurityContact_min_example.json" + }, + "Get security contact data full": { + "$ref": "./examples/SecurityContacts/GetSecurityContact_full_example.json" } }, "tags": ["Security Contacts"], @@ -300,8 +306,11 @@ }, "put": { "x-ms-examples": { - "Create security contact data": { - "$ref": "./examples/SecurityContacts/CreateSecurityContact_example.json" + "Create security contact data minimal": { + "$ref": "./examples/SecurityContacts/CreateSecurityContact_min_example.json" + }, + "Create security contact data full": { + "$ref": "./examples/SecurityContacts/CreateSecurityContact_full_example.json" } }, "tags": ["Security Contacts"], @@ -361,8 +370,11 @@ }, "patch": { "x-ms-examples": { - "Update security contact data": { - "$ref": "./examples/SecurityContacts/UpdateSecurityContact_example.json" + "Update security contact data minimal": { + "$ref": "./examples/SecurityContacts/UpdateSecurityContact_min_example.json" + }, + "Update security contact data full": { + "$ref": "./examples/SecurityContacts/UpdateSecurityContact_full_example.json" } }, "tags": ["Security Contacts"], @@ -1179,7 +1191,6 @@ }, "required": [ "email", - "phone", "alertNotifications", "alertsToAdmins" ]