Merge remote-tracking branch 'upstream/dev' into release

Azure · Jan 31, 2020 · 457eab4 · 457eab4
2 parents 5180e47 + 6dfcfde
commit 457eab4
Show file tree

Hide file tree

Showing 378 changed files with 93,305 additions and 46,089 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -7,10 +7,11 @@
 /tools/ @haroldrandom @fengzhou-msft
 /scripts/ @haroldrandom @fengzhou-msft
 /src/azure-cli-testsdk/ @bim-msft @MyronFanQiu @haroldrandom
-/src/azure-cli-core/ @jiasli @Juliehzl
+/src/azure-cli-core/ @jiasli @Juliehzl @haroldrandom @fengzhou-msft @qianwens
 /src/azure-cli/azure/cli/command_modules/acr/ @djyou
 /src/azure-cli/azure/cli/command_modules/acs/ @rjtsdl
 /src/azure-cli/azure/cli/command_modules/advisor/ @Prasanna-Padmanabhan
+/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta
 /src/azure-cli/azure/cli/command_modules/appservice/ @qwordy @Juliehzl
 /src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91
 /src/azure-cli/azure/cli/command_modules/batch/ @bgklein

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,9 +1,15 @@
 
 
+**History Notes:**  
+(Fill in the following template if multiple notes are needed, otherwise PR title will be used for history note.)
+
+[Component Name 1] (BREAKING CHANGE:) (az command:) make some customer-facing change.  
+[Component Name 2] (BREAKING CHANGE:) (az command:) make some customer-facing change.
+
 ---
 
 This checklist is used to make sure that common guidelines for a pull request are followed.
 
-- [ ] The PR has modified HISTORY.rst describing any customer-facing, functional changes. Note that this does not include changes only to help content. (see [Modifying change log](https://github.com/Azure/azure-cli/tree/master/doc/authoring_command_modules#modify-change-log)).
+- [ ] The PR title and description has followed the guideline in [Submitting Pull Requests](https://github.com/Azure/azure-cli/tree/dev/doc/authoring_command_modules#submitting-pull-requests).
 
 - [ ] I adhere to the [Command Guidelines](https://github.com/Azure/azure-cli/blob/dev/doc/command_guidelines.md).
diff --git a/az.completion b/az.completion
@@ -18,4 +18,4 @@ _python_argcomplete() {
         compopt -o nospace
     fi
 }
-complete -o nospace -F _python_argcomplete "az"
+complete -o nospace -o default -o bashdefault -F _python_argcomplete "az"
diff --git a/azure-cli.pyproj b/azure-cli.pyproj
@@ -654,10 +654,15 @@
     <Compile Include="command_modules\azure-cli-role\azure_bdist_wheel.py" />
     <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\commands.py" />
     <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\custom.py" />
-    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\latest\test_sf_commands.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\operations\applications.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\latest\test_util.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\latest\test_sf_application.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\latest\test_sf_cluster.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\_arm_deployment_utils.py" />
     <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\_help.py" />
     <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\_params.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\_validators.py" />
     <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\__init__.py" />
     <Compile Include="command_modules\azure-cli-servicefabric\setup.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\commands.py" />
@@ -1065,8 +1070,10 @@
     <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\" />
     <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\operations\" />
     <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\" />
     <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\linux\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\service\" />
     <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\windows\" />
     <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\" />
     <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\latest\" />
@@ -1337,6 +1344,8 @@
     <Content Include="command_modules\azure-cli-role\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\linux\parameter.json" />
     <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\linux\template.json" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\service\parameter.json" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\service\template.json" />
     <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\windows\parameter.json" />
     <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\windows\template.json" />
     <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\policy.json" />

diff --git a/azure-cli2017.pyproj b/azure-cli2017.pyproj
@@ -842,10 +842,15 @@
     <Compile Include="azure-cli\azure\cli\command_modules\servicebus\__init__.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\commands.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\custom.py" />
-    <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\tests\latest\test_sf_commands.py" />
+    <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\operations\applications.py" />
+    <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\tests\latest\test_util.py" />
+    <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\tests\latest\test_sf_application.py" />
+    <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\tests\latest\test_sf_cluster.py" />
+    <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\_arm_deployment_utils.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\_client_factory.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\_help.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\_params.py" />
+    <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\_validators.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\__init__.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\signalr\commands.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\signalr\custom.py" />
@@ -1167,9 +1172,13 @@
     <Folder Include="azure-cli\azure\cli\command_modules\servicebus\tests\" />
     <Folder Include="azure-cli\azure\cli\command_modules\servicebus\tests\latest\" />
     <Folder Include="azure-cli\azure\cli\command_modules\servicefabric\" />
+    <Folder Include="azure-cli\azure\cli\command_modules\servicefabric\operations\" />
     <Folder Include="azure-cli\azure\cli\command_modules\servicefabric\template\" />
     <Folder Include="azure-cli\azure\cli\command_modules\servicefabric\template\linux\" />
+    <Folder Include="azure-cli\azure\cli\command_modules\servicefabric\template\service\" />
     <Folder Include="azure-cli\azure\cli\command_modules\servicefabric\template\windows\" />
+    <Folder Include="azure-cli\azure\cli\command_modules\servicefabric\tests\" />
+    <Folder Include="azure-cli\azure\cli\command_modules\servicefabric\tests\latest\" />
     <Folder Include="azure-cli\azure\cli\command_modules\signalr\" />
     <Folder Include="azure-cli\azure\cli\command_modules\signalr\tests\" />
     <Folder Include="azure-cli\azure\cli\command_modules\signalr\tests\latest\" />
@@ -1421,6 +1430,8 @@
     <Content Include="azure-cli\azure\cli\command_modules\role\tests\latest\cert.pem" />
     <Content Include="azure-cli\azure\cli\command_modules\servicefabric\template\linux\parameter.json" />
     <Content Include="azure-cli\azure\cli\command_modules\servicefabric\template\linux\template.json" />
+    <Content Include="azure-cli\azure\cli\command_modules\servicefabric\template\service\parameter.json" />
+    <Content Include="azure-cli\azure\cli\command_modules\servicefabric\template\service\template.json" />
     <Content Include="azure-cli\azure\cli\command_modules\servicefabric\template\windows\parameter.json" />
     <Content Include="azure-cli\azure\cli\command_modules\servicefabric\template\windows\template.json" />
     <Content Include="azure-cli\azure\cli\command_modules\servicefabric\tests\policy.json" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -8,6 +8,20 @@ trigger:
     - '*'
 
 jobs:
+- job: CheckPullRequestTitle
+  displayName: "Check the Format of Pull Request Title"
+  condition: and(succeeded(), in(variables['System.PullRequest.TargetBranch'], 'dev', 'release'))
+
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+    - bash: |
+        echo "Check Title of Pull Request: #$(System.PullRequest.PullRequestNumber)"
+        title=$(curl https://api.github.com/repos/Azure/azure-cli/pulls/$(System.PullRequest.PullRequestNumber) | jq -r '.title')
+        [[ $title =~ ^(\[.*\]|\{.*\}).* ]] && exit 0
+        echo "Pull Request title should follow https://aka.ms/submitAzPR"
+        exit 1
+
 - job: RejectPullRequestToMasterBranch
   displayName: "Reject Pull Request To Master Branch"
   condition: and(succeeded(), eq(variables['System.PullRequest.TargetBranch'], 'master'))
@@ -19,33 +33,33 @@ jobs:
         echo "Reject pull request directly to master branch"
         exit 1
 
-- job: CredScan
-  displayName: "Credential Scan"
-
-  pool:
-    vmImage: "windows-2019"
-  steps:
-  - task: CredScan@2
-    inputs:
-      toolMajorVersion: 'V2'
-      suppressionsFile: ./scripts/ci/credscan/CredScanSuppressions.json
-
-  - task: PostAnalysis@1
-    inputs:
-      AllTools: false
-      APIScan: false
-      BinSkim: false
-      CodesignValidation: false
-      CredScan: true
-      FortifySCA: false
-      FxCop: false
-      ModernCop: false
-      PoliCheck: false
-      RoslynAnalyzers: false
-      SDLNativeRules: false
-      Semmle: false
-      TSLint: false
-      ToolLogsNotFoundAction: 'Standard'
+#- job: CredScan
+#  displayName: "Credential Scan"
+#
+#  pool:
+#    vmImage: "windows-2019"
+#  steps:
+#  - task: CredScan@2
+#    inputs:
+#      toolMajorVersion: 'V2'
+#      suppressionsFile: ./scripts/ci/credscan/CredScanSuppressions.json
+#
+#  - task: PostAnalysis@1
+#    inputs:
+#      AllTools: false
+#      APIScan: false
+#      BinSkim: false
+#      CodesignValidation: false
+#      CredScan: true
+#      FortifySCA: false
+#      FxCop: false
+#      ModernCop: false
+#      PoliCheck: false
+#      RoslynAnalyzers: false
+#      SDLNativeRules: false
+#      Semmle: false
+#      TSLint: false
+#      ToolLogsNotFoundAction: 'Standard'
 
 - job: ExtractMetadata
   displayName: Extract Metadata

diff --git a/cli_license_terms.md b/cli_license_terms.md