Skip to content

Commit

Permalink
chore: jsonfmt domainservices (Azure#6036)
Browse files Browse the repository at this point in the history
Ran `jsonfmt -w "specification/domainservices/**/*.json"`
  • Loading branch information
nschonni authored and tjprescott committed May 20, 2019
1 parent 28d1a9b commit 9f6fb31
Show file tree
Hide file tree
Showing 19 changed files with 288 additions and 222 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,10 @@
"location": {
"type": "string",
"description": "Resource location",
"x-ms-mutability":["read", "create"]
"x-ms-mutability": [
"read",
"create"
]
},
"tags": {
"type": "object",
Expand Down Expand Up @@ -598,24 +601,24 @@
"properties": {
"notifyGlobalAdmins": {
"type": "string",
"enum": [
"enum": [
"Enabled",
"Disabled"
],
"description": "Should global admins be notified",
"x-ms-enum": {
"x-ms-enum": {
"name": "notifyGlobalAdmins",
"modelAsString": true
}
},
"notifyDcAdmins": {
"type": "string",
"enum": [
"enum": [
"Enabled",
"Disabled"
],
"description": "Should domain controller admins be notified",
"x-ms-enum": {
"x-ms-enum": {
"name": "notifyDcAdmins",
"modelAsString": true
}
Expand Down Expand Up @@ -765,4 +768,4 @@
"x-ms-parameter-location": "method"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@
"properties": {
"domainName": "zdomain.zforest.com",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.ClassicNetwork/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"domainSecuritySettings": {
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"ldapsSettings": {
Expand All @@ -45,7 +48,7 @@
"domainName": "zdomain.zforest.com",
"vnetSiteId": "99083198-a39c-469f-972d-59017e7f078c",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.ClassicNetwork/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"ldapsSettings": {
"ldapsSettings": {
"ldaps": "Enabled",
"publicCertificate": "MIIDPDCCAiSgAwIBAgIQQUI9P6tq2p9OFIJa7DLNvTANBgkqhkiG9w0BAQsFADAgMR4w...",
"certificateThumbprint": "9154A390F0C387D679E0DD040701745CDFED67F3",
Expand All @@ -61,7 +64,10 @@
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
Expand Down Expand Up @@ -102,7 +108,10 @@
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
Expand Down Expand Up @@ -137,12 +146,15 @@
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"provisioningState": "Accepted"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
"description": "HTTP 204 (Not Content) should be used if the resource does not exist and the request is well formed."
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
Expand All @@ -75,4 +78,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,17 @@
}
],
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
Expand All @@ -78,4 +81,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,17 @@
}
],
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
Expand All @@ -77,4 +80,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,18 @@
"location": "westus",
"name": "zdomain.zforest.com",
"properties": {
"domainSecuritySettings": {
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"ldapsSettings": {
Expand Down Expand Up @@ -62,13 +65,16 @@
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
"10.0.0.5",
"10.0.0.8"
],
"domainControllerIpAddress": [
"10.0.0.5",
"10.0.0.8"
],
"serviceStatus": "Running",
"provisioningState": "Succeeded"
}
Expand Down Expand Up @@ -97,12 +103,15 @@
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"provisioningState": "Accepted"
"provisioningState": "Accepted"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,10 @@
"location": {
"type": "string",
"description": "Resource location",
"x-ms-mutability":["read", "create"]
"x-ms-mutability": [
"read",
"create"
]
},
"tags": {
"type": "object",
Expand Down Expand Up @@ -928,24 +931,24 @@
"properties": {
"notifyGlobalAdmins": {
"type": "string",
"enum": [
"enum": [
"Enabled",
"Disabled"
],
"description": "Should global admins be notified",
"x-ms-enum": {
"x-ms-enum": {
"name": "notifyGlobalAdmins",
"modelAsString": true
}
},
"notifyDcAdmins": {
"type": "string",
"enum": [
"enum": [
"Enabled",
"Disabled"
],
"description": "Should domain controller admins be notified",
"x-ms-enum": {
"x-ms-enum": {
"name": "notifyDcAdmins",
"modelAsString": true
}
Expand Down Expand Up @@ -1103,4 +1106,4 @@
"x-ms-parameter-location": "method"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@
"properties": {
"domainName": "zdomain.zforest.com",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.Network/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"domainSecuritySettings": {
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"ldapsSettings": {
Expand All @@ -45,7 +48,7 @@
"domainName": "zdomain.zforest.com",
"vnetSiteId": "99083198-a39c-469f-972d-59017e7f078c",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.Network/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"ldapsSettings": {
"ldapsSettings": {
"ldaps": "Enabled",
"publicCertificate": "MIIDPDCCAiSgAwIBAgIQQUI9P6tq2p9OFIJa7DLNvTANBgkqhkiG9w0BAQsFADAgMR4w...",
"certificateThumbprint": "9154A390F0C387D679E0DD040701745CDFED67F3",
Expand All @@ -61,7 +64,10 @@
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
Expand Down Expand Up @@ -102,7 +108,10 @@
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
Expand Down Expand Up @@ -137,12 +146,15 @@
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
"additionalRecipients": [
"jicha@microsoft.com",
"caalmont@microsoft.com"
]
},
"filteredSync": "Enabled",
"provisioningState": "Accepted"
}
}
}
}
}
}
Loading

0 comments on commit 9f6fb31

Please sign in to comment.