Merge pull request #6 from yutingc/master

Modify AvoidUsernameAndPassword and AvoidReservedParams

Author: yutingc

Rules/AvoidReservedParams.cs

@@ -33,7 +33,6 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName) {
             IEnumerable<Ast> paramAsts = ast.FindAll(testAst => testAst is ParameterAst, true);
             Ast parentAst;
 
-            string funcName;
             string paramName;
 
             PropertyInfo[] commonParams = typeof(CommonParameters).GetProperties();
@@ -55,14 +54,20 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName) {
                             parentAst = parentAst.Parent;
                         }
 
-                        if (parentAst is FunctionDefinitionAst) {
-                            funcName = string.Format(CultureInfo.CurrentCulture, Strings.ReservedParamsCmdletPrefix, (parentAst as FunctionDefinitionAst).Name);
+                        if (parentAst is FunctionDefinitionAst) 
+                        {
+                            IEnumerable<Ast> attrs = parentAst.FindAll(testAttr => testAttr is AttributeAst, true);
+                            foreach (AttributeAst attr in attrs)
+                            {
+                                if (string.Equals(attr.Extent.Text, "[CmdletBinding()]",
+                                    StringComparison.OrdinalIgnoreCase))
+                                {
+                                    string funcName = string.Format(CultureInfo.CurrentCulture,Strings.ReservedParamsCmdletPrefix, (parentAst as FunctionDefinitionAst).Name);
+                                    yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReservedParamsError, funcName,paramName), paramAst.Extent, GetName(), DiagnosticSeverity.Warning, fileName);
+                                   
+                                }
+                            }
                         }
-                        else {
-                            funcName = Strings.ReservedParamsScriptPrefix;
-                        }
-
-                        yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReservedParamsError, funcName, paramName), paramAst.Extent, GetName(), DiagnosticSeverity.Warning, fileName);
                     }
                 }
             }

Rules/AvoidUserNameAndPasswordParams.cs

@@ -34,8 +34,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
             IEnumerable<Ast> functionAsts = ast.FindAll(testAst => testAst is FunctionDefinitionAst, true);
 
             List<String> passwords = new List<String>() {"Password", "Passphrase"};
-            List<String> usernames = new List<String>() { "Username", "User", "ID", "APIKey", "Key",
-                                                        "Account", "Name" };
+            List<String> usernames = new List<String>() { "Username", "User"};
 
             foreach (FunctionDefinitionAst funcAst in functionAsts)
             {

Rules/ScriptAnalyzerBuiltinRules.csproj

@@ -61,7 +61,7 @@
     <Compile Include="AvoidShouldContinueWithoutForce.cs" />
     <Compile Include="AvoidTrapStatement.cs" />
     <Compile Include="AvoidUnitializedVariable.cs" />
-    <Compile Include="AvoidUserNameAndPasswordParams.cs" />
+    <Compile Include="AvoidUsernameAndPasswordParams.cs" />
     <Compile Include="AvoidUsingClearHost.cs" />
     <Compile Include="AvoidUsingComputerNameHardcoded.cs" />
     <Compile Include="AvoidUsingConvertToSecureStringWithPlainText.cs" />