Skip to content

[Azure Search] Merge psSdkJson6 to search-4x-preview-vs17 branch#4059

Merged
brjohnstmsft merged 379 commits intoAzure:search-4x-preview-vs17from
brjohnstmsft:merge-psSdkJson6-to-search-preview
Feb 8, 2018
Merged

[Azure Search] Merge psSdkJson6 to search-4x-preview-vs17 branch#4059
brjohnstmsft merged 379 commits intoAzure:search-4x-preview-vs17from
brjohnstmsft:merge-psSdkJson6-to-search-preview

Conversation

@brjohnstmsft
Copy link
Copy Markdown
Member

@brjohnstmsft brjohnstmsft commented Feb 8, 2018

This is a long overdue integration from psSdkJson6 to the private branch for the Azure Search preview sdk, search-4x-preview-vs17. The target branch hasn't been updated since the default branch of azure-sdk-for-net was vs17dev, hence the very large size of this PR and the large number of merge commits therein. I am purposefully not squashing these commits in order to preserve history, as the next step will be to merge this branch back into psSdkJson6.

For the Azure Search SDK specifically, this PR applies all recent data plane bug fixes and all the changes for the 2.0 management plane SDK to the target branch.

There is nothing actually new in this PR, just a whole bunch of merging.

FYI @Yahnoosh @mhko @shahabhijeet @updixit

Description


This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

SDK Generation Guidelines

  • If an SDK is being regenerated based on a new swagger spec, a link to the pull request containing these swagger spec changes has been included above.
  • The generate.cmd file for the SDK has been updated with the version of AutoRest, as well as the commitid of your swagger spec or link to the swagger spec, used to generate the code.
  • The *.csproj and AssemblyInfo.cs files have been updated with the new version of the SDK.

shahabhijeet and others added 30 commits August 7, 2017 14:45
* first version of C# apim spec on autorest

* Remove redundancies around project file
* Code gen for ADLA

* This change is mapped to this PR:
Azure/azure-rest-api-specs#1429

* This commit is for ADLA

* Code gen for ADLS

* This change is mapped to this PR:
Azure/azure-rest-api-specs#1429

* This commit for ADLS

* Code gen for ADLS (part 2)

* I missed this file!

* Code gen for ADL (part 3)

* Updating to the correct commit number:
Azure/azure-rest-api-specs#1452

* Update Azure Batch to 5.1.0 (#3513)

* Fixing publishing of symbols. Fixing issue# 3518 (#3519)

* Fix Batch changelog references (#3517)

* Do hydra to swagger specs migration for azure-sdk-for-net (#3482)

* Do hydra to swagger specs migration for azure-sdk-for-net

* Fix build failed problem

* update the assemblyinfo file with the updated version 2.6.0

* Revert "update the assemblyinfo file with the updated version 2.6.0"

This reverts commit a33beb0.

* Updata the AssemblyFileVersion to 2.6.0.0

* revert package version

* Make project files concise.

* Add Provider test case

* update the pr with new tests with session records

* remove extra code

* Fixing changelog.md

* Fixing up changelog.md

* [DataLake Analytics] Fixing changelog.md

More descriptive and fixing indent issue that was not addressed in the previous commit

* [DataLake Store] Fixing changelog.md

More descriptive and fixing indent issue not addressed in a previous commit

* [DataLake Analytics] Fixing changelog.md

Adding an important note about retrieving a list of jobs and accounts
)

* Generated Management.Sql with package-2015-05-preview api spec including datasync, added SyncAgent SyncGroup SyncMember scenario's with session records.

* Reverted version to 1.7.0, made minor changes to scenarios, re-recorded scenarios

* Regenerated sql management client now rest api specs have been merged.

* Re-recorded DataSync test scenarios
* SDK generated for networking version 2017-08-01

* Disabling network tests
* Updated RecoveryServices.Backup with latest swagger spec

* Updated sdk version in AssemblyInfo.cs and csproj

* Added generate.cmd metadata files and bumped AssemblyVersion to 2.0.0.0
…O and Paging at the same time (#3594)

* SDK generated for networking version 2017-08-01

* Disabling network tests

* regenerated SDK
* Removed the maxLength for entity names

* added test for maxlength removal

* updated the AssemblyFileVersion
* Removed the maxLength for entity names

* Added test for maxlength removal

* updated the AssemblyFileVersion
* Removed the maxLength for entity names

* Test added for maxLength removal

* updated AssemblyFileVersion
* Code gen for ADLA

* This change is mapped to this PR:
Azure/azure-rest-api-specs#1429

* This commit is for ADLA

* Code gen for ADLS

* This change is mapped to this PR:
Azure/azure-rest-api-specs#1429

* This commit for ADLS

* Code gen for ADLS (part 2)

* I missed this file!

* Code gen for ADL (part 3)

* Updating to the correct commit number:
Azure/azure-rest-api-specs#1452

* Update Azure Batch to 5.1.0 (#3513)

* Fixing publishing of symbols. Fixing issue# 3518 (#3519)

* Fix Batch changelog references (#3517)

* Do hydra to swagger specs migration for azure-sdk-for-net (#3482)

* Do hydra to swagger specs migration for azure-sdk-for-net

* Fix build failed problem

* update the assemblyinfo file with the updated version 2.6.0

* Revert "update the assemblyinfo file with the updated version 2.6.0"

This reverts commit a33beb0.

* Updata the AssemblyFileVersion to 2.6.0.0

* revert package version

* Make project files concise.

* Add Provider test case

* update the pr with new tests with session records

* remove extra code

* Fixing changelog.md

* Fixing up changelog.md

* [DataLake Analytics] Fixing changelog.md

More descriptive and fixing indent issue that was not addressed in the previous commit

* [DataLake Store] Fixing changelog.md

More descriptive and fixing indent issue not addressed in a previous commit

* [DataLake Analytics] Fixing changelog.md

Adding an important note about retrieving a list of jobs and accounts

* Revising custom Job Exists method

* Ran into two regressions in JobOperationTests.cs
* The custom Job Exists method is expecting a non-empty response body to
validate non-existence.  After speaking with a team member who
implemented the service, I can no longer rely on this.  Thus, I am
removing the logic that checks for a non-empty response body.
* Commenting out the test case for listing Jobs with a select parameter.
This is currently being fixed.

* Adding a TODO comment

* Adding this as a reminder to re-enable the test
…, and the corresponding unit tests (#3520)

* Adding ActivityLogAlerts and ActionGroups API calls, PATH operations, and the corresponding unit tests

* Generating code from the 'current' branch of the Swagger specs repo

* Adding scenario tests

* Improving scenario tests and re-recording them

* Making sure the scenario tests point to the more recent version of the Resource Manager dll. Enabling tests for netcoreapp1.1

* Reverting netcoreapp1.1 test target since it fails to find the records.

* Returning generate.md to its Azure\psSdkJson6 state

* Re-enabling tests for netcoreapp1.1
* reproing test (deep hiararchy)

* reproing test (base class property)

* fix

* bold move

* tiny improvement to generate.cmd (just making sure you get the same experience even when calling one of the RPs scripts)

* case insensitive property lookup (I guess we're already down that rabbit hole)

* tiny improvement to generate.cmd (mention commit IDs, clarifications)

* tiny improvement to generateMetadata.cmd (handle commit IDs)
… Patch scenario test. Cleaned up PollingState: Obsolete DelayInMillisecond propety, introduced DelayBetweenPolling property that returns TimeSpan. Bumped version. (#3621)
* Ver 1.1.0 initial commit

1. Everything is re-generated with the latest AutoRest (by
generate.cmd).
2. With the latest swagger file change, now Location is a parameter of
the method, not a property of client class, this is a breaking change.
3. Change the UT accordingly.
4. Bump the version to 1.1.0.

* Reversion to 2.0.0.0 as shahabhijeet suggested

Reversion to 2.0.0.0 as shahabhijeet suggested.
…re-rest-api-specs#1526) (#3616)

* sdk for 2017-07-14

* Add recorded test

* Updates csproj and test variable
* Code gen for ADLA

* This change is mapped to this PR:
Azure/azure-rest-api-specs#1429

* This commit is for ADLA

* Code gen for ADLS

* This change is mapped to this PR:
Azure/azure-rest-api-specs#1429

* This commit for ADLS

* Code gen for ADLS (part 2)

* I missed this file!

* Code gen for ADL (part 3)

* Updating to the correct commit number:
Azure/azure-rest-api-specs#1452

* Update Azure Batch to 5.1.0 (#3513)

* Fixing publishing of symbols. Fixing issue# 3518 (#3519)

* Do hydra to swagger specs migration for azure-sdk-for-net (#3482)

* Do hydra to swagger specs migration for azure-sdk-for-net

* Fix build failed problem

* update the assemblyinfo file with the updated version 2.6.0

* Revert "update the assemblyinfo file with the updated version 2.6.0"

This reverts commit a33beb0.

* Updata the AssemblyFileVersion to 2.6.0.0

* revert package version

* Make project files concise.

* Add Provider test case

* update the pr with new tests with session records

* remove extra code

* Fix Batch changelog references (#3517)

* Fixing changelog.md

* Fixing up changelog.md

* [DataLake Analytics] Fixing changelog.md

More descriptive and fixing indent issue that was not addressed in the previous commit

* [DataLake Store] Fixing changelog.md

More descriptive and fixing indent issue not addressed in a previous commit

* [DataLake Analytics] Fixing changelog.md

Adding an important note about retrieving a list of jobs and accounts

* Revising custom Job Exists method

* Ran into two regressions in JobOperationTests.cs
* The custom Job Exists method is expecting a non-empty response body to
validate non-existence.  After speaking with a team member who
implemented the service, I can no longer rely on this.  Thus, I am
removing the logic that checks for a non-empty response body.
* Commenting out the test case for listing Jobs with a select parameter.
This is currently being fixed.

* Adding a TODO comment

* Adding this as a reminder to re-enable the test

* [CODE GEN] - Reverting readOnly for two fields

* Code gen based on this very descriptive PR:
Azure/azure-rest-api-specs@e33ebf8

* [CODE GEN] - Updating the version (3.1.0 to 3.1.1)
Makes Id/Name/Type fields readonly by making set private.
* Add Azure container instance net SDK

* Revert unnecessary changes and make version consistent

* remove some unnecessary metadata
* enabling data plane to build on travis

* updates for data plane skds for travis
* Supporting LRO Patch operation. Initial set of tests. Fix for issue#3492

* Fixing a case where LRO PUT will fail during polling. Added test to cover the scenario

* Fixed another scenario where body during polling is empty for a failed status and v1 ARM spec allows it to be empty, but V2.2 ARM spec require failed/cancelled status shoudl accompany error information. Added appropriate tests for the scenarios

* Adding Release notes
* Updating ClientRuntime for publishing

* Updating version tag
- Added code generated from Azure Stream Analytics Swagger spec
containing support for Power BI and Azure Data Lake Store outputs
- Added new tests for Power BI and Azure Data Lake Store outputs
- Reran all tests and updated session records
- Updated SDK version to 2.1.0
* repro

* fix

* cleanup

* generate.cmd accepts actual repo name

* mute mkdir output
hvermis and others added 24 commits January 18, 2018 21:10
* Updating ADF SDK version for the release

* Updating ADF SDK version for the release
* Fixing wrong discriminator value for AzureFabricCreationInput
* add metadata files
#4009)

* Fixing Exception tests that had incorrect Asserts which will always succeed

* Addinga way to compare URIs between requests
…4018)

* Regenerated the SDK and re-recorded the tests based on the newer API version.

* Re-recorded the tests.

* Updated package release notes to reflect this set of changes.

* Re-recorded the tests.

* Updated the SDK based on the latest data-plane API specifications.

* Updated version and release notes.
…it tests, separate Face/CV aligning with other Vision APIs. (#3977)
…er management (#4019)

* FW:add sdk for ACE provisioning team

* Add more test cases

* Updated Swagger file, so copy new generated code and update test cases too

* Swagger is updated, so regenerated the SDK and update test cases

* Update namespace from gsm to managementpartner

* Renamed gsm to managementpartner in azure-rest-api-specs, so regenerated the sdks
* test1

* update tests

* scenario records

* fix warnings

* fix warnings

* add release note

* add metadata files
* test1

* update tests

* scenario records

* fix warnings

* fix warnings

* add release note

* add metadata files

* test files
…e, OsName and OsVersion properties for VM instance view, and adding ForceRecoveryServiceFabricPlatformUpdateDomainWalk API for VM scale set. (#4029)
* Added support for Autotuning API

* Metadata change in sql_resource-manager.txt
#4026)

* sdk generation related to Swagger pr: Azure/azure-rest-api-specs#2364

* generate from local build

* update to right version
* [Azure Search] Restoring build script and bumping data plane SDK version

The version bump is in preparation for a series of bug fixes that have been
pending for a long time. The build script change was taken from the old
abandoned vs17Dev branch.

* [Azure Search] Fix for data plane SDK issue: 3309

The FieldBuilder class in the Search .NET SDK now ignores properties marked
with JsonIgnore.

* [Azure Search] GetClient propagates SearchServiceClient's HttpClientHandler

Fixes an issue whereby setting the HttpClientHandler when creating a
SearchServiceClient has no effect on the SearchIndexClient returned by
Indexes.GetClient. This would break scenarios such as enabling GZip
compression, for example.

Now the HttpClientHandler propagates, but the DelegatingHandlers don't since
they can't be cloned and are mutated by the ServiceClient base class
constructor.
…ts (#4053)

Some time ago, we added a check to every Azure Search unit test that uses the
Run() method. This check is intended to ensure that none of our SDK code uses
the global JsonConvert.DefaultSettings, since these can be altered by other
code in the same AppDomain. This was causing issues for customers, and is the
reason we added SafeJsonConvert to ClientRuntime and AutoRest.

The check in the Run() method installs a custom JsonConverter and
ContractResolver that throw exceptions whenever they're called. It does this
using a try/finally block so that the change should only be visible while
running the unit test.

Unfortunately, since JsonConvert.DefaultSettings is global state, this
approach is fragile. For example, running tests in parallel can break this
because some infrastructure such as the VS test runner framework itself uses
JSON.NET in ways that rely on DefaultSettings.

Given the fragility of this approach, we've decided to remove these checks
altogether since they were causing spurious test failures.
* budget and marketplace api

* new generated code for consumption api

* fix subscription usage tests

* budget tests

* fix reservation tests

* re-generate sdk and update budget tests

* add budget tests for resource group name

* re-generate consumption sdk based on new swagger

* update consumption sdk test artifact

* marketplace tests pricesheet tests

* increase major version for consumption net sdk

* tests session records file update for api version bump up

* update package release notes
…talog ACL APIs (#4043)

* [CODE GEN] Account

- Object refactor

* [CODE GEN] Job

* Changing OData Query for Job_List from JobInformation to
JobInformationBasic

* [CODE GEN] Catalog

* Making List_Acl pageable

* [CODE GEN] Metadata

* Updating tests

* Updating tests

* Updating SessionRecords

* [VERSION] 3.2.3-preview to 3.3.0-preview

* [ADLA] CODE GEN -- object refactor

* [CODE GEN] Metadata

* Fixing Account custom code

* [ADLA] - Partial revert - Global parameter to method parameter

* [CODE GEN] Metadata

* Updating tests

* [ADLA] Partial revert for some job APIs

* [CODE GEN] Metadata

* Updating SessionRecords

* [CHANGELOG] Update

* [CODE GEN] Metadata

* Fixing file name manually via git mv
…4049)

* adding dns name label support for azure container instance .net sdk

* update version number

* addressing the comments

* adding the missing metadata file
@brjohnstmsft brjohnstmsft merged commit 3c16878 into Azure:search-4x-preview-vs17 Feb 8, 2018
@brjohnstmsft brjohnstmsft deleted the merge-psSdkJson6-to-search-preview branch February 8, 2018 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.