Skip to content

Commit 7c20e2c

Browse files
atpham256atpham256
committed
Update Stream Analytics PowerShell To Use Latest SDK
- Updated Stream Analytics SDK reference to the 0.16.0-preview version which corresponds to the 2015-01-01-preview Stream Analytics Service API Version - Integrated PowerShell cmdlets with the new features of the latest SDK. Most PowerShell cmdlets were already integrated since the new properties can be specified in the json file parameter. The most notable change was the addition of the OutputStartMode and OutputStartTime parameters in the StartAzureStreamAnalyticsJob cmdlet. - Re-recorded the tests and updated the session records.
1 parent 4c52410 commit 7c20e2c

File tree

11 files changed

+427
-362
lines changed

11 files changed

+427
-362
lines changed

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.17.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6161
</Reference>
6262
<Reference Include="Microsoft.Azure.Management.StreamAnalytics">
63-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.0.14.0-preview\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
63+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.0.16.0-preview\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.ResourceManager">
6666
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Resources/Input.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
],
2121
"container": "samples",
2222
"blobName": "sample-blob",
23-
"PathPattern": "LongRunning/{date}/{time}",
24-
"DateFormat": "yyyy-MM-dd",
25-
"TimeFormat": "HH:mm",
23+
"PathPattern": "",
24+
"DateFormat": "yyyy/MM/dd",
25+
"TimeFormat": "HH",
2626
"SourcePartitionCount": null,
2727
"blobSerializationBoundary": "BlobBoundary"
2828
}

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Resources/Job.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"sku": {
77
"name": "standard"
88
},
9-
"outputStartMode": "CustomTime",
10-
"outputStartTime": "2012-12-12T12:12:12Z",
119
"inputs": [
1210
{
1311
"name": "Input",
@@ -29,7 +27,8 @@
2927
"accountKey": "$EncryptedStringForTesting"
3028
}
3129
],
32-
"container": "samples"
30+
"container": "samples",
31+
"pathPattern": ""
3332
}
3433
}
3534
}

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/StreamAnalyticsScenarioTestsBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ protected StreamAnalyticsScenarioTestsBase()
3636

3737
protected void SetupManagementClients()
3838
{
39-
var dataPipelineManagementClient = GetStreamAnalyticsManagementClient();
39+
var streamAnalyticsManagementClient = GetStreamAnalyticsManagementClient();
4040
var resourceManagementClient = GetResourceManagementClient();
4141
var subscriptionsClient = GetSubscriptionClient();
4242
var galleryClient = GetGalleryClient();
4343
var authorizationManagementClient = GetAuthorizationManagementClient();
4444

45-
helper.SetupManagementClients(dataPipelineManagementClient,
45+
helper.SetupManagementClients(streamAnalyticsManagementClient,
4646
resourceManagementClient,
4747
subscriptionsClient,
4848
galleryClient,

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/SessionRecords/Microsoft.Azure.Commands.StreamAnalytics.Test.EndToEndTests/TestStreamingAnalyticsE2E.json

Lines changed: 371 additions & 344 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Gallery" version="2.6.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="0.17.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.13.0-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.StreamAnalytics" version="0.14.0-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.StreamAnalytics" version="0.16.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.5486.28526-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5486.28526-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Management.StreamAnalytics, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.0.14.0-preview\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.0.16.0-preview\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
@@ -148,6 +148,7 @@
148148
<Compile Include="Models\PSOutput.cs" />
149149
<Compile Include="Models\PSQuota.cs" />
150150
<Compile Include="Models\PSTransformation.cs" />
151+
<Compile Include="Models\StartPSJobParameter.cs" />
151152
<Compile Include="Models\StreamAnalyticsClient.cs" />
152153
<Compile Include="Models\StreamAnalyticsClient.Inputs.cs" />
153154
<Compile Include="Models\StreamAnalyticsClient.Jobs.cs" />

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Job/StartAzureStreamAnalyticsJobCommand.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using System.Security.Permissions;
2020
using Microsoft.Azure.Commands.StreamAnalytics.Models;
2121
using Microsoft.Azure.Commands.StreamAnalytics.Properties;
22+
using Microsoft.Azure.Management.StreamAnalytics.Models;
2223

2324
namespace Microsoft.Azure.Commands.StreamAnalytics
2425
{
@@ -29,6 +30,14 @@ public class StartAzureStreamAnalyticsJobCommand : StreamAnalyticsResourceProvid
2930
[ValidateNotNullOrEmpty]
3031
public string Name { get; set; }
3132

33+
[Parameter(Position = 2, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The desired output start mode for the azure stream analytics job.")]
34+
[ValidateNotNullOrEmpty]
35+
public string OutputStartMode { get; set; }
36+
37+
[Parameter(Position = 3, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The desired output start time for the azure stream analytics job.")]
38+
[ValidateNotNullOrEmpty]
39+
public DateTime? OutputStartTime { get; set; }
40+
3241
[EnvironmentPermission(SecurityAction.Demand, Unrestricted = true)]
3342
public override void ExecuteCmdlet()
3443
{
@@ -37,10 +46,15 @@ public override void ExecuteCmdlet()
3746
throw new PSArgumentNullException("ResourceGroupName");
3847
}
3948

40-
JobParametersBase parameter = new JobParametersBase()
49+
StartPSJobParameter parameter = new StartPSJobParameter()
4150
{
4251
ResourceGroupName = ResourceGroupName,
43-
JobName = Name
52+
JobName = Name,
53+
StartParameters = new JobStartParameters()
54+
{
55+
OutputStartMode = OutputStartMode,
56+
OutputStartTime = OutputStartTime
57+
}
4458
};
4559

4660
try

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StartPSJobParameter.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System;
16+
using Microsoft.Azure.Management.StreamAnalytics.Models;
17+
18+
namespace Microsoft.Azure.Commands.StreamAnalytics.Models
19+
{
20+
public class StartPSJobParameter : JobParametersBase
21+
{
22+
public JobStartParameters StartParameters { get; set; }
23+
}
24+
}

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.Jobs.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,21 +171,21 @@ public virtual PSJob CreatePSJob(CreatePSJobParameter parameter)
171171
return job;
172172
}
173173

174-
public virtual HttpStatusCode StartPSJob(string resourceGroupName, string jobName)
174+
public virtual HttpStatusCode StartPSJob(string resourceGroupName, string jobName, JobStartParameters parameter)
175175
{
176-
AzureOperationResponse response = StreamAnalyticsManagementClient.StreamingJobs.Start(resourceGroupName, jobName);
176+
AzureOperationResponse response = StreamAnalyticsManagementClient.StreamingJobs.Start(resourceGroupName, jobName, parameter);
177177

178178
return response.StatusCode;
179179
}
180180

181-
public virtual HttpStatusCode StartPSJob(JobParametersBase parameter)
181+
public virtual HttpStatusCode StartPSJob(StartPSJobParameter parameter)
182182
{
183183
if (parameter == null)
184184
{
185185
throw new ArgumentNullException("parameter");
186186
}
187187

188-
return StartPSJob(parameter.ResourceGroupName, parameter.JobName);
188+
return StartPSJob(parameter.ResourceGroupName, parameter.JobName, parameter.StartParameters);
189189
}
190190

191191
public virtual HttpStatusCode StopPSJob(string resourceGroupName, string jobName)

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Extensions" version="0.14.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.StreamAnalytics" version="0.14.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.StreamAnalytics" version="0.16.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

0 commit comments

Comments
 (0)