Skip to content

Commit 5f092bf

Browse files
author
Dongwei Wang
committed
Save current status
1 parent e63934c commit 5f092bf

File tree

7 files changed

+77
-57
lines changed

7 files changed

+77
-57
lines changed

‎src/Synapse/Synapse/Az.Synapse.psd1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ CmdletsToExport = 'Get-AzSynapseSparkJob', 'Stop-AzSynapseSparkJob',
172172
'Remove-AzSynapseWorkspaceKey', 'Update-AzSynapseWorkspaceKey',
173173
'New-AzSynapseManagedVirtualNetworkConfig',
174174
'Update-AzSynapseManagedVirtualNetworkConfig', 'Get-AzSynapseSqlScript',
175-
'Remove-AzSynapseSqlScript', 'Set-AzSynapseSqlScript'
175+
'Remove-AzSynapseSqlScript', 'Set-AzSynapseSqlScript',
176+
'Get-AzSynapseSparkJobDefinition', 'Remove-AzSynapseSparkJobDefinition', 'Set-AzSynapseSparkJobDefinition'
176177

177178
# Variables to export from this module
178179
# VariablesToExport = @()

‎src/Synapse/Synapse/Commands/DataPlaneCommands/Artifact/SparkJobDefinitions/SetAzureSynapseSparkJobDefinition.cs

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Azure.Analytics.Synapse.Artifacts.Models;
2-
using Microsoft.Azure.Commands.Common.Exceptions;
1+
using Microsoft.Azure.Commands.Common.Exceptions;
32
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
43
using Microsoft.Azure.Commands.Synapse.Common;
54
using Microsoft.Azure.Commands.Synapse.Models;
@@ -10,11 +9,11 @@
109

1110
namespace Microsoft.Azure.Commands.Synapse
1211
{
13-
[Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + SynapseConstants.SynapsePrefix + SynapseConstants.SqlScript,
12+
[Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + SynapseConstants.SynapsePrefix + SynapseConstants.SparkJobDefinition,
1413
DefaultParameterSetName = SetByName, SupportsShouldProcess = true)]
15-
[Alias("New-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + SynapseConstants.SynapsePrefix + SynapseConstants.SqlScript)]
16-
[OutputType(typeof(PSSqlScriptResource))]
17-
public class SetAzureSynapseSqlScript : SynapseArtifactsCmdletBase
14+
[Alias("New-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + SynapseConstants.SynapsePrefix + SynapseConstants.SparkJobDefinition)]
15+
[OutputType(typeof(PSSparkJobDefinitionResource))]
16+
public class SetAzureSynapseSparkJobDefinition : SynapseArtifactsCmdletBase
1817
{
1918
private const string SetByName = "SetByName";
2019
private const string SetByObject = "SetByObject";
@@ -36,25 +35,22 @@ public class SetAzureSynapseSqlScript : SynapseArtifactsCmdletBase
3635
[ValidateNotNull]
3736
public PSSynapseWorkspace WorkspaceObject { get; set; }
3837

39-
[Parameter(ValueFromPipelineByPropertyName = false, Mandatory = true, HelpMessage = HelpMessages.SqlScriptName)]
38+
[Parameter(ValueFromPipelineByPropertyName = false, Mandatory = true, HelpMessage = HelpMessages.SparkJobDefinitionName)]
4039
[ValidateNotNullOrEmpty]
41-
[Alias("SqlScriptName")]
40+
[Alias("SparkJobDefinitionName")]
4241
public string Name { get; set; }
4342

4443
[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = RenameByName,
45-
Mandatory = true, HelpMessage = HelpMessages.SqlScriptName)]
44+
Mandatory = true, HelpMessage = HelpMessages.SparkJobDefinitionName)]
4645
[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = RenameByObject,
47-
Mandatory = true, HelpMessage = HelpMessages.SqlScriptName)]
46+
Mandatory = true, HelpMessage = HelpMessages.SparkJobDefinitionName)]
4847
[ValidateNotNullOrEmpty]
4948
public string NewName { get; set; }
5049

51-
[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = SetByName,
52-
Mandatory = true, HelpMessage = HelpMessages.ScriptFilePath)]
53-
[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = SetByObject,
54-
Mandatory = true, HelpMessage = HelpMessages.ScriptFilePath)]
50+
[Parameter(ValueFromPipelineByPropertyName = false, Mandatory = true, HelpMessage = HelpMessages.JsonFilePath)]
5551
[ValidateNotNullOrEmpty]
5652
[Alias("File")]
57-
public string ScriptFile { get; set; }
53+
public string DefinitionFile { get; set; }
5854

5955
[Parameter(Mandatory = false, HelpMessage = HelpMessages.AsJob)]
6056
public SwitchParameter AsJob { get; set; }
@@ -66,33 +62,20 @@ public override void ExecuteCmdlet()
6662
this.WorkspaceName = this.WorkspaceObject.Name;
6763
}
6864

69-
if (this.ShouldProcess(this.WorkspaceName, String.Format(Resources.SettingSynapseSqlScript, this.Name, this.WorkspaceName)))
65+
if (this.ShouldProcess(this.WorkspaceName, String.Format(Resources.SettingSynapseSparkJobDefinition, this.Name, this.WorkspaceName)))
7066
{
7167
switch (ParameterSetName)
7268
{
7369
case SetByName:
7470
case SetByObject:
75-
string query = this.ReadFileAsText(this.TryResolvePath(ScriptFile));
76-
SqlConnection connection = new SqlConnection(SqlConnectionType.SqlPool, )
77-
SqlScriptContent sqlScriptContent = new SqlScriptContent(query, connection)
78-
{
79-
Metadata = new SqlScriptMetadata
80-
{
81-
Language = "sql"
82-
}
83-
};
84-
SqlScript script = new SqlScript(content);
85-
SqlScriptResource sqlScript = new SqlScriptResource(this.Name, new SqlScript)
86-
{
87-
88-
}
89-
WriteObject(new PSSqlScriptResource(SynapseAnalyticsClient.CreateOrUpdateSqlScript(this.Name, rawJsonContent)));
71+
string rawJsonContent = SynapseAnalyticsClient.ReadJsonFileContent(this.TryResolvePath(DefinitionFile));
72+
WriteObject(new PSSparkJobDefinitionResource(SynapseAnalyticsClient.CreateOrUpdateSparkJobDefinition(this.Name, rawJsonContent)));
9073
break;
9174

9275
case RenameByName:
9376
case RenameByObject:
94-
SynapseAnalyticsClient.RenameSqlScript(this.Name, this.NewName);
95-
WriteObject(new PSSqlScriptResource(SynapseAnalyticsClient.GetSqlScript(this.Name)));
77+
SynapseAnalyticsClient.RenameSparkJobDefinition(this.Name, this.NewName);
78+
WriteObject(new PSSparkJobDefinitionResource(SynapseAnalyticsClient.GetSparkJobDefinition(this.Name)));
9679
break;
9780

9881
default: throw new AzPSInvalidOperationException(string.Format(Resources.InvalidParameterSet, this.ParameterSetName));

‎src/Synapse/Synapse/Commands/DataPlaneCommands/Artifact/SqlScripts/SetAzureSynapseSqlScript.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ public class SetAzureSynapseSqlScript : SynapseArtifactsCmdletBase
4848
[ValidateNotNullOrEmpty]
4949
public string NewName { get; set; }
5050

51-
[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = SetByName,
52-
Mandatory = true, HelpMessage = HelpMessages.ScriptFilePath)]
53-
[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = SetByObject,
54-
Mandatory = true, HelpMessage = HelpMessages.ScriptFilePath)]
55-
[ValidateNotNullOrEmpty]
56-
[Alias("File")]
57-
public string ScriptFile { get; set; }
51+
//[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = SetByName,
52+
// Mandatory = true, HelpMessage = HelpMessages.ScriptFilePath)]
53+
//[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = SetByObject,
54+
// Mandatory = true, HelpMessage = HelpMessages.ScriptFilePath)]
55+
//[ValidateNotNullOrEmpty]
56+
//[Alias("File")]
57+
//public string ScriptFile { get; set; }
5858

5959
[Parameter(Mandatory = false, HelpMessage = HelpMessages.AsJob)]
6060
public SwitchParameter AsJob { get; set; }
@@ -72,21 +72,21 @@ public override void ExecuteCmdlet()
7272
{
7373
case SetByName:
7474
case SetByObject:
75-
string query = this.ReadFileAsText(this.TryResolvePath(ScriptFile));
76-
SqlConnection connection = new SqlConnection(SqlConnectionType.SqlPool, )
77-
SqlScriptContent sqlScriptContent = new SqlScriptContent(query, connection)
78-
{
79-
Metadata = new SqlScriptMetadata
80-
{
81-
Language = "sql"
82-
}
83-
};
84-
SqlScript script = new SqlScript(content);
85-
SqlScriptResource sqlScript = new SqlScriptResource(this.Name, new SqlScript)
86-
{
75+
//string query = this.ReadFileAsText(this.TryResolvePath(ScriptFile));
76+
//SqlConnection connection = new SqlConnection(SqlConnectionType.SqlPool, )
77+
//SqlScriptContent sqlScriptContent = new SqlScriptContent(query, connection)
78+
//{
79+
// Metadata = new SqlScriptMetadata
80+
// {
81+
// Language = "sql"
82+
// }
83+
//};
84+
//SqlScript script = new SqlScript(content);
85+
//SqlScriptResource sqlScript = new SqlScriptResource(this.Name, new SqlScript)
86+
//{
8787

88-
}
89-
WriteObject(new PSSqlScriptResource(SynapseAnalyticsClient.CreateOrUpdateSqlScript(this.Name, rawJsonContent)));
88+
//}
89+
//WriteObject(new PSSqlScriptResource(SynapseAnalyticsClient.CreateOrUpdateSqlScript(this.Name, rawJsonContent)));
9090
break;
9191

9292
case RenameByName:

‎src/Synapse/Synapse/Models/PSSparkJobDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public PSSparkJobDefinition(SparkJobDefinition properties)
99
Description = properties?.Description;
1010
TargetBigDataPool = properties?.TargetBigDataPool != null ? new PSBigDataPoolReference(properties.TargetBigDataPool) : null;
1111
RequiredSparkVersion = properties?.RequiredSparkVersion;
12-
JobProperties = properties?.JobProperties;
12+
JobProperties = properties?.JobProperties != null ? new PSSparkJobProperties(properties.JobProperties) : null;
1313
}
1414

1515
/// <summary> The description of the Spark job definition. </summary>

‎src/Synapse/Synapse/Models/SynapseAnalyticsArtifactsClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public void RenameSqlScript(string sqlScriptName, string newName)
308308

309309
public SparkJobDefinitionResource CreateOrUpdateSparkJobDefinition(string SparkJobDefinitionName, string rawJsonContent)
310310
{
311-
SparkJobDefinitionResource SparkJobDefinition = JsonConvert.DeserializeObject<SparkJobDefinitionResource>(rawJsonContent);
311+
SparkJobDefinitionResource SparkJobDefinition = new SparkJobDefinitionResource(JsonConvert.DeserializeObject<SparkJobDefinition>(rawJsonContent));
312312
return _sparkJobDefinitionClient.CreateOrUpdateSparkJobDefinition(SparkJobDefinitionName, SparkJobDefinition);
313313
}
314314

‎src/Synapse/Synapse/Properties/Resources.Designer.cs

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Synapse/Synapse/Properties/Resources.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,4 +681,13 @@ Are you sure you want to continue?</value>
681681
<data name="SettingSynapseSqlScript" xml:space="preserve">
682682
<value>Setting SQL script '{0}' in workspace '{1}'.</value>
683683
</data>
684+
<data name="RemoveSynapseSparkJobDefinition" xml:space="preserve">
685+
<value>Are you sure you want to remove Spark job definition '{0}'?</value>
686+
</data>
687+
<data name="RemovingSynapseSparkJobDefinition" xml:space="preserve">
688+
<value>Deleting Spark job definition '{0}' in workspace '{1}'.</value>
689+
</data>
690+
<data name="SettingSynapseSparkJobDefinition" xml:space="preserve">
691+
<value>Setting Spark job definition '{0}' in workspace '{1}'.</value>
692+
</data>
684693
</root>

0 commit comments

Comments
 (0)