Merge branch 'clu' of https://github.com/Azure/azure-powershell into clu

Author: EmmaZhu

src/CLU/Commands.Common.Authentication/Authentication/AdalTokenProvider.cs

@@ -12,9 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Commands.Common.Authentication.Properties;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using System;
-using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {

src/CLU/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs

@@ -12,14 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Commands.Common.Authentication.Properties;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using Microsoft.Rest;
 using System;
-using System.Collections.Generic;
-using System.Security;
-using System.Security.Cryptography.X509Certificates;
-using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {

src/CLU/Commands.Common.Authentication/Authentication/UserTokenProvider.cs

@@ -17,9 +17,9 @@
 using Microsoft.Rest;
 using System;
 using System.Runtime.InteropServices;
-using Commands.Common.Authentication.Properties;
 using Microsoft.Rest.Azure.Authentication;
 using System.Management.Automation;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {

src/CLU/Commands.Common.Authentication/AuthenticationFactory.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,10 @@
 using System;
 using System.Linq;
 using System.Management.Automation;
-using System.Security;
-using Commands.Common.Authentication.Properties;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using Microsoft.Rest;
 using Microsoft.Rest.Azure.Authentication;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Factories
 {

src/CLU/Commands.Common.Authentication/ClientFactory.cs

@@ -12,18 +12,17 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Commands.Common.Authentication.Properties;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Rest;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
 using System.Management.Automation;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Reflection;
-using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Factories
 {

src/CLU/Commands.Common.Authentication/JsonUtilities.cs

@@ -12,12 +12,12 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Commands.Common.Authentication.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {

src/CLU/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs

@@ -12,9 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Commands.Common.Authentication.Properties;
 using System;
 using System.Collections.Generic;
-using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Models
 {
@@ -372,7 +372,7 @@ public static class AzureEnvironmentConstants
 
         public const string USGovernmentSqlDatabaseDnsSuffix = ".database.usgovcloudapi.net";
 
-        public const string AzureActiveDirectoryEndpoint = "https://login.windows.net/";
+        public const string AzureActiveDirectoryEndpoint = "https://login.microsoftonline.com/";
 
         public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/";
 

src/CLU/Commands.Common.Authentication/Models/AzureSMProfile.cs

@@ -12,12 +12,12 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Commands.Common.Authentication.Properties;
 using Microsoft.Rest;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Models
 {

src/CLU/Commands.Common.Authentication/Models/DiskDataStore.cs

@@ -12,11 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Commands.Common.Authentication.Properties;
 using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Models
 {

src/CLU/Commands.Common.Authentication/Properties/Resources.Designer.cs

@@ -120,9 +120,6 @@
   <data name="AccountNeedsToBeSpecified" xml:space="preserve">
     <value>Account needs to be specified</value>
   </data>
-  <data name="AzureDirectoryName" xml:space="preserve">
-    <value>Windows Azure Powershell</value>
-  </data>
   <data name="CertificateNotFoundInStore" xml:space="preserve">
     <value>No certificate was found in the certificate store with thumbprint {0}</value>
   </data>

src/CLU/Commands.Common.Authentication/Properties/Resources.resx

@@ -12,10 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Commands.Common.Authentication.Properties;
 using System;
 using System.IO;
 using System.Linq;
-using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {

src/CLU/Commands.Common.Authentication/Validate.cs

@@ -436,17 +436,11 @@ protected virtual void WriteExceptionError(Exception ex)
             WriteError(new ErrorRecord(ex, string.Empty, ErrorCategory.CloseError, null));
         }
 
-        protected PSObject ConstructPSObject(string typeName, params object[] args)
+        protected PSObject ConstructPSObject(params object[] args)
         {
-            return PowerShellUtilities.ConstructPSObject(typeName, args);
+            return PowerShellUtilities.ConstructPSObject(args);
         }
-
-        protected void SafeWriteOutputPSObject(string typeName, params object[] args)
-        {
-            PSObject customObject = this.ConstructPSObject(typeName, args);
-            WriteObject(customObject);
-        }
-
+        
         private void FlushDebugMessages(bool record = false)
         {
             if (record)

src/CLU/Commands.Common/AzurePSCmdlet.cs

@@ -86,5 +86,14 @@ public static implicit operator AzureContext(PSAzureContext context)
         public PSAzureTenant Tenant { get; set; }
 
         public byte[] TokenCache { get; set; }
+
+        public override string ToString()
+        {
+            var account = Account != null ? Account.Id : string.Empty;
+            var subscription = Subscription != null ? Subscription.SubscriptionId : string.Empty;
+            var tenant = Tenant != null ? Tenant.TenantId : string.Empty;
+            var environment = Environment != null ? Environment.Name : EnvironmentName.AzureCloud;
+            return $"{{Account: {account}, Subscription: {subscription}, Tenant: {tenant}, Environment: {environment}}}";
+        }
     }
 }

src/CLU/Commands.Common/Models/PSAzureContext.cs

@@ -64,6 +64,11 @@ public IDictionary<string, PSAzureEnvironment> Environments
             get { return _env; }
         }
 
+        public string EnvironmentNames
+        {
+            get { return _env == null? null : $"{string.Join(", ", _env.Keys.ToArray())}"; }
+        }
+
         /// <summary>
         /// The current credentials and metadata for connecting with the current Azure cloud instance.
         /// </summary>

src/CLU/Commands.Common/Models/PSAzureProfile.cs

@@ -50,17 +50,12 @@ private static void ChangeForTargetEnvironment(Func<IEnumerable<string>, IEnumer
             }
         }
 
-        public static PSObject ConstructPSObject(string typeName, params object[] args)
+        public static PSObject ConstructPSObject(params object[] args)
         {
             Debug.Assert(args.Length % 2 == 0, "The parameter args length must be even number");
 
             PSObject outputObject = new PSObject();
-
-            if (!string.IsNullOrEmpty(typeName))
-            {
-                outputObject.TypeNames.Add(typeName);
-            }
-
+            
             for (int i = 0, j = 0; i < args.Length / 2; i++, j += 2)
             {
                 outputObject.Properties.Add(new PSNoteProperty(args[j].ToString(), args[j + 1]));

src/CLU/Commands.Common/PowerShellUtilities.cs

@@ -0,0 +1,32 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources
+{
+    public class ResourceLock<TProperties> : Resource<TProperties>
+    {
+        public ResourceLock(Resource<TProperties> r)
+            : base(r)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the lock id for the resource.
+        /// </summary>
+        [JsonProperty(Required = Required.Default)]
+        public string LockId { get; set; }
+    }
+}

src/CLU/Commands.ResourceManager.Cmdlets/Entities/Locks/ResourceLock.cs

@@ -0,0 +1,33 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Policy
+{
+    public class ResourcePolicyAssignment<TProperties> : Resource<TProperties>
+    {
+        public ResourcePolicyAssignment(Resource<TProperties> r)
+            : base(r)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the policy assignment id for the resource.
+        /// </summary>
+        [JsonProperty(Required = Required.Default)]
+        public string PolicyAssignmentId { get; set; }
+    }
+}

src/CLU/Commands.ResourceManager.Cmdlets/Entities/Policy/ResourcePolicyAssignment.cs

@@ -0,0 +1,33 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Policy
+{
+    public class ResourcePolicyDefinition<TProperties> : Resource<TProperties>
+    {
+        public ResourcePolicyDefinition(Resource<TProperties> r)
+            : base(r)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the policy definition id for the resource.
+        /// </summary>
+        [JsonProperty(Required = Required.Default)]
+        public string PolicyDefinitionId { get; set; }
+    }
+}

src/CLU/Commands.ResourceManager.Cmdlets/Entities/Policy/ResourcePolicyDefinition.cs

@@ -23,6 +23,27 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources
     /// </summary>
     public class Resource<TProperties>
     {
+        public Resource()
+        {
+
+        }
+
+        public Resource(Resource<TProperties> r)
+        {
+            this.ChangedTime = r.ChangedTime;
+            this.CreatedTime = r.CreatedTime;
+            this.ETag = r.ETag;
+            this.Id = r.Id;
+            this.Kind = r.Kind;
+            this.Location = r.Location;
+            this.Name = r.Name;
+            this.Plan = r.Plan;
+            this.Properties = r.Properties;
+            this.Sku = r.Sku;
+            this.Tags = r.Tags;
+            this.Type = r.Type;
+        }
+
         /// <summary>
         /// Gets or sets the properties.
         /// </summary>

src/CLU/Commands.ResourceManager.Cmdlets/Entities/Resources/Resource.cs

@@ -48,7 +48,7 @@ internal static class JTokenExtensions
         /// </summary>
         /// <param name="jtoken">The <see cref="JObject"/></param>
         /// <param name="objectType">The type of the object.</param>
-        internal static PSObject ToPsObject(this JToken jtoken, string objectType = null)
+        internal static PSObject ToPsObject(this JToken jtoken)
         {
             if (jtoken == null)
             {
@@ -63,12 +63,7 @@ internal static PSObject ToPsObject(this JToken jtoken, string objectType = null
 
             var jobject = (JObject)jtoken;
             var psObject = new PSObject();
-
-            if (!string.IsNullOrWhiteSpace(objectType))
-            {
-                psObject.TypeNames.Add(objectType);
-            }
-
+            
             foreach (var property in jobject.Properties())
             {
                 psObject.Properties.Add(new PSNoteProperty(