adding support for regions like china,germany

epkalyanr · epkalyanr · commit df131451ae15 · 2017-08-21T15:41:05.000-07:00
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj
@@ -56,7 +56,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.HDInsight.Job">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.Job.2.0.3\lib\net40\Microsoft.Azure.Management.HDInsight.Job.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.Job.2.0.4\lib\net40\Microsoft.Azure.Management.HDInsight.Job.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Storage">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/HDInsightTestBase.cs b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/HDInsightTestBase.cs
@@ -85,6 +85,8 @@ public virtual void SetupManagementClientForJobTests()
                 .Verifiable();
 
             var configurationResponse = new Dictionary<string, string>();
+            configurationResponse.Add("fs.defaultFS", "wasb://tempstorageaccount@xyz.blob.core.windows.net");
+            configurationResponse.Add("fs.azure.account.key.xyz.blob.core.windows.net", "tempkey");
 
             hdinsightManagementMock.Setup(c => c.GetClusterConfigurations(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
                 .Returns(configurationResponse)
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/JobTests.cs b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/UnitTests/JobTests.cs
@@ -25,6 +25,8 @@
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Moq;
 using Xunit;
+using System.IO;
+using System.Text;
 
 namespace Microsoft.Azure.Commands.HDInsight.Test
 {
@@ -228,6 +230,34 @@ public void GetJobWithIdProvided()
                     f.WriteObject(It.Is<AzureHDInsightJob>(job => job.JobId.Equals(jobId))));
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void GetJobOutput()
+        {
+            string sampleOutput = "1";
+            // Update HDInsight Management properties for Job.
+            SetupManagementClientForJobTests();
+            var jobId = "jobid_1984120_001";
+            var cmdlet = GetJobOutputCommandDefinition();
+            cmdlet.JobId = jobId;
+
+            MemoryStream jobOutput = new MemoryStream(Encoding.UTF8.GetBytes(sampleOutput));
+
+            var reader = new StreamReader(jobOutput);
+            var text = reader.ReadToEnd();
+            jobOutput.Seek(0, SeekOrigin.Begin);
+
+            hdinsightJobManagementMock.Setup(c => c.GetJobOutput(It.IsAny<string>(),It.IsAny<IStorageAccess>()))
+                .Returns(jobOutput)
+                .Verifiable();
+
+            cmdlet.ExecuteCmdlet();
+            commandRuntimeMock.VerifyAll();
+            commandRuntimeMock.Verify(
+                f =>
+                    f.WriteObject(It.Is<string>(Output => Output.Equals(text))));
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ListJobs()
@@ -383,6 +413,20 @@ public GetAzureHDInsightJobCommand GetJobCommandDefinition()
             return cmdlet;
         }
 
+        public GetAzureHDInsightJobOutputCommand GetJobOutputCommandDefinition()
+        {
+            var cmdlet = new GetAzureHDInsightJobOutputCommand
+            {
+                CommandRuntime = commandRuntimeMock.Object,
+                HDInsightJobClient = hdinsightJobManagementMock.Object,
+                HDInsightManagementClient = hdinsightManagementMock.Object,
+                HttpCredential = new PSCredential("httpuser", string.Format("Password1!").ConvertToSecureString()),
+                ClusterName = ClusterName
+            };
+
+            return cmdlet;
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void WaitForJobCompletion_Sucess()
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.HDInsight" version="2.0.7" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.HDInsight.Job" version="2.0.3" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.HDInsight.Job" version="2.0.4" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj
@@ -129,7 +129,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.HDInsight.Job">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.Job.2.0.3\lib\net40\Microsoft.Azure.Management.HDInsight.Job.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.Job.2.0.4\lib\net40\Microsoft.Azure.Management.HDInsight.Job.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/JobCommands/GetAzureHDInsightJobOutputCommand.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/JobCommands/GetAzureHDInsightJobOutputCommand.cs
@@ -133,6 +133,8 @@ private static string Convert(Stream stream)
 
         internal IStorageAccess GetDefaultStorageAccess(string resourceGroupName, string clusterName)
         {
+            var StorageAccountSuffix = "";
+    
             if (DefaultContainer == null && DefaultStorageAccountName == null && DefaultStorageAccountKey == null)
             {
                 var DefaultStorageAccount = GetDefaultStorageAccount(resourceGroupName, clusterName);
@@ -143,6 +145,7 @@ internal IStorageAccess GetDefaultStorageAccess(string resourceGroupName, string
                     DefaultContainer = wasbAccount.StorageContainerName;
                     DefaultStorageAccountName = wasbAccount.StorageAccountName;
                     DefaultStorageAccountKey = wasbAccount.StorageAccountKey;
+                    StorageAccountSuffix = DefaultContext.Environment.StorageEndpointSuffix;
                 }
                 else
                 {
@@ -151,7 +154,7 @@ internal IStorageAccess GetDefaultStorageAccess(string resourceGroupName, string
 
             }
 
-            return new AzureStorageAccess(DefaultStorageAccountName, DefaultStorageAccountKey, DefaultContainer);
+            return new AzureStorageAccess(DefaultStorageAccountName, DefaultStorageAccountKey, DefaultContainer,StorageAccountSuffix);
         }
     }
 }
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Job/AzureHdInsightJobManagementClient.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Job/AzureHdInsightJobManagementClient.cs
@@ -141,7 +141,7 @@ public void StopJob(string jobId)
             HdInsightJobManagementClient.JobManagement.KillJob(jobId);
         }
 
-        public Stream GetJobOutput(string jobid, IStorageAccess storageAccess)
+        public virtual Stream GetJobOutput(string jobid, IStorageAccess storageAccess)
         {
             var joboutput = HdInsightJobManagementClient.JobManagement.GetJobOutput(jobid, storageAccess);
             return joboutput;
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config b/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.HDInsight" version="2.0.7" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.HDInsight.Job" version="2.0.3" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.HDInsight.Job" version="2.0.4" targetFramework="net45" />
   <package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,8 @@ private static string Convert(Stream stream)`
`133`	`133`
`134`	`134`	`internal IStorageAccess GetDefaultStorageAccess(string resourceGroupName, string clusterName)`
`135`	`135`	`{`
	`136`	`+ var StorageAccountSuffix = "";`
	`137`	`+`
`136`	`138`	`if (DefaultContainer == null && DefaultStorageAccountName == null && DefaultStorageAccountKey == null)`
`137`	`139`	`{`
`138`	`140`	`var DefaultStorageAccount = GetDefaultStorageAccount(resourceGroupName, clusterName);`
`@@ -143,6 +145,7 @@ internal IStorageAccess GetDefaultStorageAccess(string resourceGroupName, string`
`143`	`145`	`DefaultContainer = wasbAccount.StorageContainerName;`
`144`	`146`	`DefaultStorageAccountName = wasbAccount.StorageAccountName;`
`145`	`147`	`DefaultStorageAccountKey = wasbAccount.StorageAccountKey;`
	`148`	`+ StorageAccountSuffix = DefaultContext.Environment.StorageEndpointSuffix;`
`146`	`149`	`}`
`147`	`150`	`else`
`148`	`151`	`{`
`@@ -151,7 +154,7 @@ internal IStorageAccess GetDefaultStorageAccess(string resourceGroupName, string`
`151`	`154`
`152`	`155`	`}`
`153`	`156`
`154`		`- return new AzureStorageAccess(DefaultStorageAccountName, DefaultStorageAccountKey, DefaultContainer);`
	`157`	`+ return new AzureStorageAccess(DefaultStorageAccountName, DefaultStorageAccountKey, DefaultContainer,StorageAccountSuffix);`
`155`	`158`	`}`
`156`	`159`	`}`
`157`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public void StopJob(string jobId)`
`141`	`141`	`HdInsightJobManagementClient.JobManagement.KillJob(jobId);`
`142`	`142`	`}`
`143`	`143`
`144`		`- public Stream GetJobOutput(string jobid, IStorageAccess storageAccess)`
	`144`	`+ public virtual Stream GetJobOutput(string jobid, IStorageAccess storageAccess)`
`145`	`145`	`{`
`146`	`146`	`var joboutput = HdInsightJobManagementClient.JobManagement.GetJobOutput(jobid, storageAccess);`
`147`	`147`	`return joboutput;`