Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mitryakh/merge conflicts #13929

Merged
merged 177 commits into from
Jan 12, 2021
Merged

Mitryakh/merge conflicts #13929

merged 177 commits into from
Jan 12, 2021

Conversation

MikhailTryakhov
Copy link
Contributor

Description

Merged with master

Checklist

  • I have read the Submitting Changes section of CONTRIBUTING.md
  • The title of the PR is clear and informative
  • The appropriate ChangeLog.md file(s) has been updated:
    • For any service, the ChangeLog.md file can be found at src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md
    • A snippet outlining the change(s) made in the PR should be written under the ## Upcoming Release header -- no new version header should be added
  • The PR does not introduce breaking changes
  • If applicable, the changes made in the PR have proper test coverage
  • For public API changes to cmdlets:
    • a cmdlet design review was approved for the changes in this repository (Microsoft internal only)
      • {Please put the link here}
    • the markdown help files have been regenerated using the commands listed here

erich-wang and others added 30 commits November 19, 2020 09:34
* psd1 & psm1 of Az.Installer with a demo cmdlet (#12698)

* Internal/az.installer (#12817)

* add util functions

* add install-azmodule

* add log to cmdlets

* move verbose messages to debug

* move under tools\

* polish warning message

* move install-azmodule to exports

* export install-azmodule

* rename to az.tools.installer

* Internal/az.installer (#12860)

* add util functions

* add install-azmodule

* add log to cmdlets

* move verbose messages to debug

* move under tools\

* polish warning message

* move install-azmodule to exports

* export install-azmodule

* rename to az.tools.installer

* add uninstall-AzModule

* Cmdlet Update-AzModule (#12832)

* Update-AzModule

* Address to PM requirements

1. Remove prefix Az. when input module name
2. update calculate from most recently installed respositories of
different modules
3. reorder the sequence of module udpate and uninstall
4. other bug fix

* Add telemetry

* Support telemetry

* Move Get-AzModuleUpdateList to internal (#12865)

* add telemetry to Uninstall-AzModule cmdlet

* bugfix: module name was not handled properly

* Add environment variable to disable telemetry

* parallel executing Install/Uninstall module

* update code after review

* improve performance

* Fix Update-AzModule issues

* bug fix

* remove unused util

* remove az.accounts when allow preview

* Fix issue when no module to udpate

* Add sign pipeline

* skip confirmation when remove-job

* remove debug info

* fix parameter reference

* Initial checking in AzPredictor (#12847)

- It contains an implementation of ICommandPredictor that provides
  predictions to PSReadLine.
- It also talks to the service endpoints to get the predictions.
- It reads from the profile settings about the service endpoint.
- There are some tests cases.

* filter installedmodules before uninstall

* bugfix for uninstall

* Add synopsis and example to exported cmdlets

* add default parameter set for uninstall-azmodule

* add input validatin

* remove unnecessary warning message

* Build and package module under artifacts folder

* Improve Az.Tool.Predictor (#12922)

* Set up the dependencies on the PSReadline 2.1.0

* Initialize the env when the module is imported.

- Add a script AzPredictor.ps1 to set the psreadline prediction view and
  source.
- The script is run when the module is imported.

* Fix a bug when loading settings from user profile.

- The settings from user profile may not exist. In this case we should
  just ignore it and use the default one.

* Fix issues in getting settings and send requests.

- Fix the way to get the Azure PowerShell settings regarding collecting
  telemetry.
- Avoid sending multiple requests while there is one running.

* Use the NuGet pacakges from nuget.org.

- Remove the local feed for those NuGet packages.

* Rename namespace/assemblies/module name

* Collect telemetry where we get the prediction.

* Make some classes internal.

* Add dependencies on Az module

- This avoid the issue that our module loads
  Microsoft.Azure.PowerShell.Common dlls and Az tries to load it too.

* Remove ps1 file that sets psreadline options.

- We should instruct the users to set the options by themselves.

* Remove psreadline module since it's not released.

* Fix the merge issue

* Add Az as external dependency

* Add pipeline 'sign-tool-predictor'

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* net.webclient.downloadfile

* refine command

* clean build

* Update sign-tool-predictor.yml for Azure Pipelines

* Improve the build of Az.Tools.Predictor (#12974)

* Change the build for Az.Tools.Predictor

 - Do a 'dotnet publish' instead of 'dotnet build' when the
   configuration is release.
- When the configuration is release, replace the output folder with the
  ones from publish folder. The output folder is where the package
  retrieve the contents from. This will have the module and all the
  dependencies in the package.
- The package target only runs when the configuration is release.
- Add a target Test to run the unit tests.
- Update the build command in azure pipeline to build with configuration
  release.

* Specify the sub-folder artifact for each tool.

- The build process involves deleting the artifact folders. And each
  tool shares the same artifact folder. This may be an issue if we build
  them in parralel because the build process of a tool will delete the
  folder while another tool is being built.
- We'll use sub-folder for each tool in the artifact folder.

Co-authored-by: Beisi Zhou <[email protected]>

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Override powershellcorecommandPrefix

* join_path

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Install Az

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Sign dll

* Remove dll sign

* Predict parameter values in the suggestion (#12984)

* Get the parameter value from the history.

* Add a mock ps console for testing purpose.

- The mock ps console will echo back most of the commands. So that we
  don't need to really execute the Az command on Azure to test the
  prediction.

* improve telemetry (#13025)

* Correlate the telemetry event we send.

- We have these telemetry entry points when we provide suggestion, when
  a suggestion is accepted, and when the user executes some command. We
  add a SuggestionId to the telemetry events so that we can correlate
  those three events. Doing that we know what suggestions are provided,
  accepted, and executed.

* Collect and correlate our telemetry event.

- With this change, we have these telemetry events;
  * RequestPrediction
  * GetSuggestion
  * AcceptSuggestion
  * CommandHistory
- The events can be correlated by the session id and correlate id that
  are associate with the events.

* Fix the request body.

* Rename the prediction source.

* Collect telemetry when an error occurs.

* Remove some PII field

* Collect user input in GetSuggestion event.

* Use a common telemetry event prefix.

* Remove the .gitignore that shouldn't be added.

* Clean up the code.

* return multiple suggestion (#13098)

* Return multiple suggestions.

- Add a setting to configure at most how many suggestions to return.
- We'll go through the command/parameters one by one and to construct
  the suggestion. We may return multiple suggestions for the same
  command but with different parameter sets;

* Use camel casing in the setting fields.

- Looks like other json file in $HOME/.azure use camel case or
  PascalCase. None use snake case.

* Fix a logic error.

- We'll use the command list for suggestion while the prediction list
  isn't available.

* Stop finding suggestion when the count is met.

* Improve the MockPSConsole.

* Cache the last two commands from the history.

* Reduce the dependencies on Azure powershell common. (#13113)

- That assembly and its dependencies causes a conflict if we load this module
  and Az.Accounts module. Though we can work around by sepcifying Az as a
  dependencies on this module, that'll cause long loading time.
- The reason of loading that assembly is to get the setting about Azure
  PowerShell data collection. We can copy part of the code to load that
  file, so that we don't need that assembly as the dependency.

* Add a missing file. (#13234)

* Fix duplicate text (#13326)

* Improve the debugging experience.

- GetSuggestion gets cancelled during debugging because it times out. So
  we use an environment variable to control whether to allow
cancellation from psreadline.
- Use another macro to control if print message for telemetry.

* Fix a bug that the command line is repeated in the suggestion.

- When we parse the command line and there is an incomplete parameter
  list, we repeat the command line in the suggestion.
- The cause is that we parse the command line and get the wrong
  parameter set from the user input

* Update how we send request and collect telemetry (#13327)

* Fix the query

* Reduce the number of requests to the service.

- We request the prediction for the command history. When the command
  history isn't changed, we don't need to request the prediction again.

* Not to collect the parameter value in the telemetry.

* Bug fixes and performance improvement (#13410)

* Reduce extra cost to the perf issue.

* Remove the aggregation on the parameter set.

* Fix an issue

* Fix some comments.

* Improve the telemetry and http request (#13354)

* Collect user id and mac address.

- We hash the user account id and the mac address, and collect those in
  the telemetry. These are used to find how many users are using this
  mdoule.
- We also send the hashed user account id in the http request header.
  This is used to enable throttling by user account.

* Rename

* Collect more data for diagnostic purpose.

* Fix typo

* Remove getting Az modules versions.

* Update module infomation (#13328)

* Set the description and dependencies for the module.

* Update the project file and module manifest.

* Update manifest and csproj

* Fix typo

* Move PSReadLine to ExternalModuleDependencies.

- PSReadLine is in beta and there are issues in setting RequiredModules
  with a beta one. So move it as an ExternalModuleDependencies.

* Update package script to support requiredmodule (#13424)

* Add variety to Az.Predictor result list (#13420)

* add variety to predictions list

* add variety to predictions list

* Update description for release

* Add PublishLocation to build.proj of Az.Tools.Installer

Co-authored-by: Jin Lei <[email protected]>
Co-authored-by: Yabo Hu <[email protected]>
Co-authored-by: msJinLei <[email protected]>
Co-authored-by: msJinLei <[email protected]>
Co-authored-by: kceiw <[email protected]>
Co-authored-by: Beisi Zhou <[email protected]>
Co-authored-by: Beisi Zhou <[email protected]>
Co-authored-by: yemohyle <[email protected]>
* [dailybuild] bump version and sign

* Polish codes

* cancel commit intermediate result to 'internal/dailybuild'

Co-authored-by: azuresdkci <[email protected]>
* psd1 & psm1 of Az.Installer with a demo cmdlet (#12698)

* Internal/az.installer (#12817)

* add util functions

* add install-azmodule

* add log to cmdlets

* move verbose messages to debug

* move under tools\

* polish warning message

* move install-azmodule to exports

* export install-azmodule

* rename to az.tools.installer

* Internal/az.installer (#12860)

* add util functions

* add install-azmodule

* add log to cmdlets

* move verbose messages to debug

* move under tools\

* polish warning message

* move install-azmodule to exports

* export install-azmodule

* rename to az.tools.installer

* add uninstall-AzModule

* Cmdlet Update-AzModule (#12832)

* Update-AzModule

* Address to PM requirements

1. Remove prefix Az. when input module name
2. update calculate from most recently installed respositories of
different modules
3. reorder the sequence of module udpate and uninstall
4. other bug fix

* Add telemetry

* Support telemetry

* Move Get-AzModuleUpdateList to internal (#12865)

* add telemetry to Uninstall-AzModule cmdlet

* bugfix: module name was not handled properly

* Add environment variable to disable telemetry

* parallel executing Install/Uninstall module

* update code after review

* improve performance

* Fix Update-AzModule issues

* bug fix

* remove unused util

* remove az.accounts when allow preview

* Fix issue when no module to udpate

* Add sign pipeline

* skip confirmation when remove-job

* remove debug info

* fix parameter reference

* Initial checking in AzPredictor (#12847)

- It contains an implementation of ICommandPredictor that provides
  predictions to PSReadLine.
- It also talks to the service endpoints to get the predictions.
- It reads from the profile settings about the service endpoint.
- There are some tests cases.

* filter installedmodules before uninstall

* bugfix for uninstall

* Add synopsis and example to exported cmdlets

* add default parameter set for uninstall-azmodule

* add input validatin

* remove unnecessary warning message

* Build and package module under artifacts folder

* Improve Az.Tool.Predictor (#12922)

* Set up the dependencies on the PSReadline 2.1.0

* Initialize the env when the module is imported.

- Add a script AzPredictor.ps1 to set the psreadline prediction view and
  source.
- The script is run when the module is imported.

* Fix a bug when loading settings from user profile.

- The settings from user profile may not exist. In this case we should
  just ignore it and use the default one.

* Fix issues in getting settings and send requests.

- Fix the way to get the Azure PowerShell settings regarding collecting
  telemetry.
- Avoid sending multiple requests while there is one running.

* Use the NuGet pacakges from nuget.org.

- Remove the local feed for those NuGet packages.

* Rename namespace/assemblies/module name

* Collect telemetry where we get the prediction.

* Make some classes internal.

* Add dependencies on Az module

- This avoid the issue that our module loads
  Microsoft.Azure.PowerShell.Common dlls and Az tries to load it too.

* Remove ps1 file that sets psreadline options.

- We should instruct the users to set the options by themselves.

* Remove psreadline module since it's not released.

* Fix the merge issue

* Add Az as external dependency

* Add pipeline 'sign-tool-predictor'

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* net.webclient.downloadfile

* refine command

* clean build

* Update sign-tool-predictor.yml for Azure Pipelines

* Improve the build of Az.Tools.Predictor (#12974)

* Change the build for Az.Tools.Predictor

 - Do a 'dotnet publish' instead of 'dotnet build' when the
   configuration is release.
- When the configuration is release, replace the output folder with the
  ones from publish folder. The output folder is where the package
  retrieve the contents from. This will have the module and all the
  dependencies in the package.
- The package target only runs when the configuration is release.
- Add a target Test to run the unit tests.
- Update the build command in azure pipeline to build with configuration
  release.

* Specify the sub-folder artifact for each tool.

- The build process involves deleting the artifact folders. And each
  tool shares the same artifact folder. This may be an issue if we build
  them in parralel because the build process of a tool will delete the
  folder while another tool is being built.
- We'll use sub-folder for each tool in the artifact folder.

Co-authored-by: Beisi Zhou <[email protected]>

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Override powershellcorecommandPrefix

* join_path

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Install Az

* Update sign-tool-predictor.yml for Azure Pipelines

* Update sign-tool-predictor.yml for Azure Pipelines

* Sign dll

* Remove dll sign

* Predict parameter values in the suggestion (#12984)

* Get the parameter value from the history.

* Add a mock ps console for testing purpose.

- The mock ps console will echo back most of the commands. So that we
  don't need to really execute the Az command on Azure to test the
  prediction.

* improve telemetry (#13025)

* Correlate the telemetry event we send.

- We have these telemetry entry points when we provide suggestion, when
  a suggestion is accepted, and when the user executes some command. We
  add a SuggestionId to the telemetry events so that we can correlate
  those three events. Doing that we know what suggestions are provided,
  accepted, and executed.

* Collect and correlate our telemetry event.

- With this change, we have these telemetry events;
  * RequestPrediction
  * GetSuggestion
  * AcceptSuggestion
  * CommandHistory
- The events can be correlated by the session id and correlate id that
  are associate with the events.

* Fix the request body.

* Rename the prediction source.

* Collect telemetry when an error occurs.

* Remove some PII field

* Collect user input in GetSuggestion event.

* Use a common telemetry event prefix.

* Remove the .gitignore that shouldn't be added.

* Clean up the code.

* return multiple suggestion (#13098)

* Return multiple suggestions.

- Add a setting to configure at most how many suggestions to return.
- We'll go through the command/parameters one by one and to construct
  the suggestion. We may return multiple suggestions for the same
  command but with different parameter sets;

* Use camel casing in the setting fields.

- Looks like other json file in $HOME/.azure use camel case or
  PascalCase. None use snake case.

* Fix a logic error.

- We'll use the command list for suggestion while the prediction list
  isn't available.

* Stop finding suggestion when the count is met.

* Improve the MockPSConsole.

* Cache the last two commands from the history.

* Reduce the dependencies on Azure powershell common. (#13113)

- That assembly and its dependencies causes a conflict if we load this module
  and Az.Accounts module. Though we can work around by sepcifying Az as a
  dependencies on this module, that'll cause long loading time.
- The reason of loading that assembly is to get the setting about Azure
  PowerShell data collection. We can copy part of the code to load that
  file, so that we don't need that assembly as the dependency.

* Add a missing file. (#13234)

* Fix duplicate text (#13326)

* Improve the debugging experience.

- GetSuggestion gets cancelled during debugging because it times out. So
  we use an environment variable to control whether to allow
cancellation from psreadline.
- Use another macro to control if print message for telemetry.

* Fix a bug that the command line is repeated in the suggestion.

- When we parse the command line and there is an incomplete parameter
  list, we repeat the command line in the suggestion.
- The cause is that we parse the command line and get the wrong
  parameter set from the user input

* Update how we send request and collect telemetry (#13327)

* Fix the query

* Reduce the number of requests to the service.

- We request the prediction for the command history. When the command
  history isn't changed, we don't need to request the prediction again.

* Not to collect the parameter value in the telemetry.

* add variety to predictions list

* add variety to predictions list

* Bug fixes and performance improvement (#13410)

* Reduce extra cost to the perf issue.

* Remove the aggregation on the parameter set.

* Fix an issue

* Fix some comments.

* Improve the telemetry and http request (#13354)

* Collect user id and mac address.

- We hash the user account id and the mac address, and collect those in
  the telemetry. These are used to find how many users are using this
  mdoule.
- We also send the hashed user account id in the http request header.
  This is used to enable throttling by user account.

* Rename

* Collect more data for diagnostic purpose.

* Fix typo

* Remove getting Az modules versions.

* Fixed issue of duplicate threshold consistency caused by two Query function calls as well as duplicate tolerance when list of novel commands is insufficiently small

* Fixed issue of duplicate threshold consistency caused by two Query function calls as well as duplicate tolerance when list of novel commands is insufficiently small

* remove commented lines, change Dictionary to IDictionary

Co-authored-by: Jin Lei <[email protected]>
Co-authored-by: Yabo Hu <[email protected]>
Co-authored-by: dingmeng-xue <[email protected]>
Co-authored-by: msJinLei <[email protected]>
Co-authored-by: msJinLei <[email protected]>
Co-authored-by: kceiw <[email protected]>
Co-authored-by: Beisi Zhou <[email protected]>
Co-authored-by: Beisi Zhou <[email protected]>
* [Storage] Support upload 4TB Azure file

* change Azure.Core version to 1.6 (#10)

* Upgrade System.Buffers to 4.5 (#11)

* change Azure.Core version to 1.6

* Upgrade System.Buffers to 4.5.0

* Add missing assemblity to exception for CI fail

Co-authored-by: erich-wang <[email protected]>
* Implementing changes for BYOK healthcareapis

* Fixing build error in healthcareapis set azure method

* Regenerating documentation

* Fixing bugs and updating recording file

* Healthcareapis
* Updating help files
* Updating test recording
* Removing unused code in test script

* Addressing PR comments

* Removing trailing " from help file

* Fixing build errors and updating test record file

* Update ChangeLog.md

Co-authored-by: Mark Baker <[email protected]>
Co-authored-by: Jin Lei <[email protected]>
* Added new examples for hashtable type parameter

* Update ChangeLog.md

* Update changelog.md

Co-authored-by: Jin Lei <[email protected]>
* practice

* practice

* practice

* practicing

* more practice

* attempting NextLink

* successful RG iteration

* attempt to list multiple VMs with same name in multiple RGs.

* attempts at using Get

* now attempting moving filtering earlier

* mapping works? paging unsure

* compile errors for list trying to access power state data.

* fewest errors version

* save old changes and new functional

* new functional, existing tests pass

* dev and testing completed

* cleaning and test

* cleanup
)

* change version commparator from double to version

* Add missing files
* Prevent duplicate rules from being created.

* Update ChangeLog
* secret management

* update changelog.md

* remove -AsHashtable from ConvertFrom-Json to compatible with windows powershell

* try to set subscription to vault subscription
…RoutingRule (#13542)

* Adding priority field to AppGw RequestRoutingRules

* Updated changeLog and help md files

* Adding priority field to AppGw RequestRoutingRules

* Updated changeLog and help md files

* Suppressing existing creds in md files

* Recreating help md files

* Suppressing the creds in json files

* Replacing plaintext password with variables

* Removing the plaintext password from the docs

Co-authored-by: Vinay Mundada <[email protected]>
…tion to work with PowerShell Core (#13557)

* Update Get-AzKeyVaultCertificate.md

The existing syntax does not seem to work in PowerShell Core.  Using the proposed syntax works with both PowerShell Desktop and Core.  When Calling the 'import' in this line:
$x509Cert.Import($secretByte, "", "Exportable,PersistKeySet") in PowerShell core, an error is received "Import" with "3" argument(s): "X509Certificate is immutable on this platform. Use the equivalent constructor instead."  
Declaring the cert object like this works fine:
$x509Cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($secretByte, "", "Exportable,PersistKeySet")

The recommended change is a combination of the existing MS Documentation and the above which was pulled from: https://gist.github.com/holgerjay/0db1f759f93cba268d671341b787472a

* Remove duplicated line in example

Co-authored-by: Yeming Liu <[email protected]>
* update spark version

* update ChangeLog.md

Co-authored-by: Wan Yang <[email protected]>
* start initial setup

* initial file

* begin dev, cmdlet framework

* dev, no compile errors

* completed dev

* completed dev  final

* weird test failure when calling API

* this manual setup test works fine after 50mins runtime

* help doc

* default parameter set

* removing unneeded usings

* cleaning up test

* test cleanup and re-record

* re-recorded test file

* test cleanup

* checkin test

test seems to pass in Playback when resource is deleted, can be run at checkin?

* Revert "test cleanup and re-record"

This reverts commit 8a42a5c.

* defaultparameterset string

* recorded test file

* removed incorrectly located test file
…record tests (#13563)

* Add byDict parameter set for New-AzSapMonitorProviderInstance and re-record tests

* Remove the incorrect link

* Fixed the help link issue

* Fix the link issue in the proxy file

* revert hana psd1
* bump to API version 2020-07-01

* Update link to ANF docs site

* Update ChangeLog.md

Co-authored-by: Audunn Baldvinsson <[email protected]>
Co-authored-by: Jin Lei <[email protected]>
* version bump up

* Update Az.StackHCI.psd1
…lt value to None (#13457)

* Change SubscriptionsLimit default value to None

* Update changelog

* Fix

* update changelog.md

Co-authored-by: Yeming Liu <[email protected]>
…13524)

* Supported "all" as an option when setting key vault access policies

* minor fix in docs

* fix test
Fix a typo for the WorkspaceResourceId parameter in the PowerShell example.
…13489)

* add support for restore point and sql admin

* add support for audit in sql pool and workspace

* add support for security center in workspace

* add help docs

* add support for transparent data encryption protector

* update help docs

* add -Force for remove cmdlet

* update changelog

* update management client

* fix for design review

* fix for design review

* fix for design review

* fix for CI

* fix for CI security

* delete TDE related cmdlets because of not supported

* fix null exception of storage account access key

* Update ChangeLog.md

* Use the latest SDK

* fix for update threat protection

* switch to official SDK

* Update changelog and Synapse.csproj

* Update ChangeLog.md

Fix ChangeLog.md merging error

* Update ChangeLog.md

Co-authored-by: Wan Yang <[email protected]>
Co-authored-by: Jin Lei <[email protected]>
Co-authored-by: Dongwei Wang <[email protected]>
* rename db property and update tests

* add secondaryType property

* Update help files

* update change log

* Add back ReadReplicaCount

* Add back ReadReplicaCount to the model

* Make ReadReplicaCount an alias

* Add ReadReplicaCount back to model
* Remove-AzSynapseSqlPoolRestorePoint

* add wsname sqlpoolname

* refine restorepoint and deleteoperation

* refine restore point and resource id

* add help and test

* refine restorepointcreatationdate

* refine and simpify codes

* refine test

* update session records for testsynapsesqlpool

* Move RemoveAzureSynapseSqlPoolRestorePoint.cs and update changelog entry

* Use local resource id

Co-authored-by: Dongwei Wang <[email protected]>
* fix sas-token issue

* Update ChangeLog.md

Polish changelog

Co-authored-by: Jin Lei <[email protected]>
dagoroz and others added 8 commits January 11, 2021 14:04
* Added principal type to New-AzRoleDefinition calls

* add principal type check for update role assignment

* re-record tests

* fix tests

* update test

* skip non deterministic tests

* delete credentials

* use ressource string
* First version flexible server of PostgreSql

* Add change log for postgresql
…13895)

* disallowing updates using New-AzCosmosDBAccount cmdlet

* updating changeLog and Test session records

* re-ran tests for add region + addressed comment on ChangeLog

* Adding analytical storage ttl in Sql Container

* updating help

* update changelog

* improving help msg

Co-authored-by: Meha Kaushik <[email protected]>
…us command (#13903)

* initial

* remove model

* Add AsJob Switch parameter so user can execute as background process as this is a long-running op

* change log updated

* regenerated help files

Co-authored-by: Milan Brkic <[email protected]>
* Move ADDomainServices to master

* Add ADDomainServices

Co-authored-by: azurepowershell <[email protected]>
@isra-fel
Copy link
Member

isra-fel commented Jan 12, 2021

We just fixed a build issue #13923 this morning so please sync with LATEST master branch.

@isra-fel isra-fel added this to the S181 (2021-01-19) milestone Jan 12, 2021
@isra-fel isra-fel self-assigned this Jan 12, 2021
@MikhailTryakhov
Copy link
Contributor Author

Thank you @isra-fel

@isra-fel isra-fel merged commit a60e990 into network-august Jan 12, 2021
@isra-fel isra-fel deleted the mitryakh/merge-conflicts branch January 12, 2021 08:35
@isra-fel isra-fel restored the mitryakh/merge-conflicts branch January 12, 2021 08:36
isra-fel added a commit that referenced this pull request Jan 12, 2021
@isra-fel isra-fel deleted the mitryakh/merge-conflicts branch January 12, 2021 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.