Skip to content

Commit

Permalink
Domain Services Swagger: Fix Put and Patch Domain Service Input
Browse files Browse the repository at this point in the history
  • Loading branch information
@jihochang @marstr
jihochang authored and marstr committed Nov 2, 2018
1 parent 85131ef commit 4833cfa
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 189 deletions.
72 changes: 16 additions & 56 deletions ...ation/domainservices/resource-manager/Microsoft.AAD/stable/2017-01-01/domainservices.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,18 +147,14 @@
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service in the specified subscription and resource group."
"$ref": "#/parameters/DomainServiceNameParameter"
},
{
"name": "properties",
"name": "domainService",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/DomainServiceProperties"
"$ref": "#/definitions/DomainService"
},
"description": "Properties supplied to the Create or Update a Domain Service operation."
}
Expand Down Expand Up @@ -208,11 +204,7 @@
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service in the specified subscription and resource group."
"$ref": "#/parameters/DomainServiceNameParameter"
}
],
"responses": {
Expand Down Expand Up @@ -247,11 +239,7 @@
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service in the specified subscription and resource group."
"$ref": "#/parameters/DomainServiceNameParameter"
}
],
"responses": {
Expand Down Expand Up @@ -290,18 +278,14 @@
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service in the specified subscription and resource group."
"$ref": "#/parameters/DomainServiceNameParameter"
},
{
"name": "properties",
"name": "domainService",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/DomainServicePatchProperties"
"$ref": "#/definitions/DomainService"
},
"description": "Properties supplied to the Update a Domain Service operation."
}
Expand Down Expand Up @@ -365,9 +349,6 @@
"description": "Resource etag"
}
},
"required": [
"location"
],
"x-ms-azure-resource": true
},
"DomainService": {
Expand Down Expand Up @@ -492,35 +473,6 @@
}
}
},
"DomainServicePatchProperties": {
"description": "Update Properties of the Domain Service.",
"properties": {
"ldapsSettings": {
"$ref": "#/definitions/LdapsSettings",
"description": "Secure LDAP Settings"
},
"notificationSettings": {
"$ref": "#/definitions/NotificationSettings",
"description": "Notification Settings"
},
"domainSecuritySettings": {
"$ref": "#/definitions/DomainSecuritySettings",
"description": "DomainSecurity Settings"
},
"filteredSync": {
"type": "string",
"enum": [
"Enabled",
"Disabled"
],
"description": "Enabled or Disabled flag to turn on Group-based filtered sync",
"x-ms-enum": {
"name": "filteredSync",
"modelAsString": true
}
}
}
},
"LdapsSettings": {
"description": "Secure LDAP Settings",
"properties": {
Expand Down Expand Up @@ -803,6 +755,14 @@
"minLength": 1,
"maxLength": 90,
"x-ms-parameter-location": "method"
},
"DomainServiceNameParameter": {
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service.",
"x-ms-parameter-location": "method"
}
}
}
44 changes: 24 additions & 20 deletions ...rvices/resource-manager/Microsoft.AAD/stable/2017-01-01/examples/CreateDomainService.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,30 @@
"subscriptionId": "1639790a-76a2-4ac4-98d9-8562f5dfcb4d",
"resourceGroupName": "sva-tt-WUS",
"domainServiceName": "zdomain.zforest.com",
"location": "westus",
"properties": {
"domainName": "zdomain.zforest.com",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.ClassicNetwork/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
},
"filteredSync": "Enabled",
"ldapsSettings": {
"ldaps": "Enabled",
"pfxCertificate": "MIIDPDCCAiSgAwIBAgIQQUI9P6tq2p9OFIJa7DLNvTANBgkqhkiG9w0BAQsFADAgMR4w...",
"pfxCertificatePassword": "Password01",
"externalAccess": "Enabled"
"domainService": {
"id": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/sva-tt-WUS/providers/Microsoft.AAD/domainServices/zdomain.zforest.com",
"location": "westus",
"name": "zdomain.zforest.com",
"properties": {
"domainName": "zdomain.zforest.com",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.ClassicNetwork/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
},
"filteredSync": "Enabled",
"ldapsSettings": {
"ldaps": "Enabled",
"pfxCertificate": "MIIDPDCCAiSgAwIBAgIQQUI9P6tq2p9OFIJa7DLNvTANBgkqhkiG9w0BAQsFADAgMR4w...",
"pfxCertificatePassword": "Password01",
"externalAccess": "Enabled"
}
}
}
},
Expand Down
40 changes: 22 additions & 18 deletions ...rvices/resource-manager/Microsoft.AAD/stable/2017-01-01/examples/UpdateDomainService.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,28 @@
"subscriptionId": "1639790a-76a2-4ac4-98d9-8562f5dfcb4d",
"resourceGroupName": "sva-tt-WUS",
"domainServiceName": "zdomain.zforest.com",
"location": "westus",
"properties": {
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
},
"filteredSync": "Enabled",
"ldapsSettings": {
"ldaps": "Enabled",
"pfxCertificate": "MIIDPDCCAiSgAwIBAgIQQUI9P6tq2p9OFIJa7DLNvTANBgkqhkiG9w0BAQsFADAgMR4w...",
"pfxCertificatePassword": "Password01",
"externalAccess": "Enabled"
"domainService": {
"id": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/sva-tt-WUS/providers/Microsoft.AAD/domainServices/zdomain.zforest.com",
"location": "westus",
"name": "zdomain.zforest.com",
"properties": {
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
},
"filteredSync": "Enabled",
"ldapsSettings": {
"ldaps": "Enabled",
"pfxCertificate": "MIIDPDCCAiSgAwIBAgIQQUI9P6tq2p9OFIJa7DLNvTANBgkqhkiG9w0BAQsFADAgMR4w...",
"pfxCertificatePassword": "Password01",
"externalAccess": "Enabled"
}
}
}
},
Expand Down
72 changes: 16 additions & 56 deletions ...ation/domainservices/resource-manager/Microsoft.AAD/stable/2017-06-01/domainservices.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,18 +147,14 @@
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service in the specified subscription and resource group."
"$ref": "#/parameters/DomainServiceNameParameter"
},
{
"name": "properties",
"name": "domainService",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/DomainServiceProperties"
"$ref": "#/definitions/DomainService"
},
"description": "Properties supplied to the Create or Update a Domain Service operation."
}
Expand Down Expand Up @@ -208,11 +204,7 @@
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service in the specified subscription and resource group."
"$ref": "#/parameters/DomainServiceNameParameter"
}
],
"responses": {
Expand Down Expand Up @@ -247,11 +239,7 @@
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service in the specified subscription and resource group."
"$ref": "#/parameters/DomainServiceNameParameter"
}
],
"responses": {
Expand Down Expand Up @@ -290,18 +278,14 @@
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service in the specified subscription and resource group."
"$ref": "#/parameters/DomainServiceNameParameter"
},
{
"name": "properties",
"name": "domainService",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/DomainServicePatchProperties"
"$ref": "#/definitions/DomainService"
},
"description": "Properties supplied to the Update a Domain Service operation."
}
Expand Down Expand Up @@ -365,9 +349,6 @@
"description": "Resource etag"
}
},
"required": [
"location"
],
"x-ms-azure-resource": true
},
"DomainService": {
Expand Down Expand Up @@ -492,35 +473,6 @@
}
}
},
"DomainServicePatchProperties": {
"description": "Update Properties of the Domain Service.",
"properties": {
"ldapsSettings": {
"$ref": "#/definitions/LdapsSettings",
"description": "Secure LDAP Settings"
},
"notificationSettings": {
"$ref": "#/definitions/NotificationSettings",
"description": "Notification Settings"
},
"domainSecuritySettings": {
"$ref": "#/definitions/DomainSecuritySettings",
"description": "DomainSecurity Settings"
},
"filteredSync": {
"type": "string",
"enum": [
"Enabled",
"Disabled"
],
"description": "Enabled or Disabled flag to turn on Group-based filtered sync",
"x-ms-enum": {
"name": "filteredSync",
"modelAsString": true
}
}
}
},
"LdapsSettings": {
"description": "Secure LDAP Settings",
"properties": {
Expand Down Expand Up @@ -803,6 +755,14 @@
"minLength": 1,
"maxLength": 90,
"x-ms-parameter-location": "method"
},
"DomainServiceNameParameter": {
"name": "domainServiceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the domain service.",
"x-ms-parameter-location": "method"
}
}
}
Loading

0 comments on commit 4833cfa

Please sign in to comment.