Skip to content

Commit

Permalink
Reorder param to avoid breaking change, add first example for ADL (#927)
Browse files Browse the repository at this point in the history
* fix for validation error in ADLA

Remove minimum and add an explanation.

* Initial example for feedback

Please look at this and let me know if this is the right approach

* move firewallallowazureIps to the end

This avoids a param reordering breaking change.

* fix example.

* Unlink example

This is due to github issue:
#928
  • Loading branch information
begoldsm authored and olydis committed Feb 11, 2017
1 parent 2843040 commit 0ae749b
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 24 deletions.
52 changes: 52 additions & 0 deletions arm-datalake-analytics/job/2016-11-01/examples/AdlJobCreate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"api-version": "2016-11-01",
"jobIdentity": "9c498166-15d6-45f6-ac3a-b9518af0abf3",
"accountName": "contosoadla",
"parameters" :{
"name": "TestJob",
"type": "USql",
"degreeOfParallelism": 1,
"priority": 1000,
"properties": {
"type": "USql",
"script": "DROP DATABASE IF EXISTS foo; CREATE DATABASE foo;"
}
}
},
"responses": {
"200": {
"body": {
"jobId": "9c498166-15d6-45f6-ac3a-b9518af0abf3",
"name": "TestJob",
"type": "USql",
"submitter": "[email protected]",
"degreeOfParallelism": 1,
"priority": 1000,
"submitTime": "2017-02-08T11:31:07.6332831-08:00",
"state": "Compiling",
"result": "None",
"stateAuditRecords": [{
"newState": "New",
"timeStamp": "2017-02-08T11:31:07.6332831-08:00",
"details": "userName:;submitMachine:N/A"
}],
"properties": {
"owner": "[email protected]",
"resources": [],
"runtimeVersion": "default",
"rootProcessNodeId": "00000000-0000-0000-0000-000000000000",
"algebraFilePath": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2017/02/08/19/31/9c498166-15d6-45f6-ac3a-b9518af0abf3/algebra.xml",
"compileMode": "Semantic",
"errorSource": "Unknown",
"totalCompilationTime": "PT0S",
"totalPausedTime": "PT0S",
"totalQueuedTime": "PT0S",
"totalRunningTime": "PT0S",
"expirationTimeUtc": "0001-01-01T00:00:00Z",
"type": "USql"
}
}
}
}
}
48 changes: 24 additions & 24 deletions arm-datalake-store/account/2016-11-01/swagger/account.json
Original file line number Diff line number Diff line change
Expand Up @@ -1196,18 +1196,6 @@
"modelAsString": false
}
},
"firewallAllowAzureIps": {
"type": "string",
"description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "FirewallAllowAzureIpsState",
"modelAsString": false
}
},
"firewallRules": {
"type": "array",
"items": {
Expand Down Expand Up @@ -1283,6 +1271,18 @@
},
"readOnly": true,
"description": "the commitment tier in use for the current month."
},
"firewallAllowAzureIps": {
"type": "string",
"description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "FirewallAllowAzureIpsState",
"modelAsString": false
}
}
},
"description": "Data Lake Store account properties information"
Expand All @@ -1301,18 +1301,6 @@
"modelAsString": false
}
},
"firewallAllowAzureIps": {
"type": "string",
"description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "FirewallAllowAzureIpsState",
"modelAsString": false
}
},
"trustedIdProviderState": {
"type": "string",
"description": "The current state of the trusted identity provider feature for this Data Lake store account. Disabling trusted identity provider functionality does not remove the providers, they will just be ignored until this feature is re-enabled.",
Expand Down Expand Up @@ -1345,6 +1333,18 @@
"modelAsString": false
},
"description": "the commitment tier to use for next month."
},
"firewallAllowAzureIps": {
"type": "string",
"description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "FirewallAllowAzureIpsState",
"modelAsString": false
}
}
},
"description": "Data Lake Store account properties information to be updated."
Expand Down

0 comments on commit 0ae749b

Please sign in to comment.