Define match conditions for CreateOrUpdate and Delete operations #11116

rakshith91 · 2020-04-29T05:55:19Z

Added only_if_unchanged boolean param as suggested in the issue description. But from what i understand, this "disregards" if_none_match in access conditions. Is there a specific reason for that?

sdk/search/azure-search-documents/azure/search/documents/_service/_datasources_client.py

rakshith91 · 2020-04-29T05:58:41Z

sdk/search/azure-search-documents/azure/search/documents/_service/_skillsets_client.py

@@ -176,9 +190,11 @@ def create_or_update_skillset(self, name, **kwargs):

        """
        kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
+        access_condition = None

        if "skillset" in kwargs:


I think we need more consistency in create_or_update method signatures across clients. We have 3 different ways of implementing them already :)

Can you be more specific?

Will drag this discussion off the PR and send a mail about it.

heaths

Overall, the API changes look good.

…ice/_datasources_client.py

sdk/search/azure-search-documents/azure/search/documents/_service/_datasources_client.py

sdk/search/azure-search-documents/tests/test_service_live.py

sdk/search/azure-search-documents/tests/async_tests/test_service_live_async.py

rakshith91 · 2020-05-01T19:49:25Z

mypy seems green -
https://dev.azure.com/azure-sdk/public/_build/results?buildId=378569&view=results

bryevdv · 2020-05-01T19:52:19Z

Yes, I saw that, I am not sure why the UI is not registering the completed job. I think you will have to kick off a new run

sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py

rakshith91 · 2020-05-01T19:55:44Z

/azp run python - search -ci

azure-pipelines · 2020-05-01T19:55:49Z

No pipelines are associated with this pull request.

rakshith91 · 2020-05-01T19:56:03Z

/azp run python - search - ci

azure-pipelines · 2020-05-01T19:56:16Z

Azure Pipelines successfully started running 1 pipeline(s).

sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py

…ice/_utils.py

…ice/_utils.py Co-authored-by: Johan Stenberg (MSFT) <johan.stenberg@microsoft.com>

johanste · 2020-05-01T20:30:40Z

sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py

@@ -151,3 +159,28 @@ def listize_synonyms(synonym_map):
    # type: (dict) -> dict
    synonym_map["synonyms"] = synonym_map["synonyms"].split("\n")
    return synonym_map
+
+def get_access_conditions(model, match_condition=MatchConditions.Unconditionally):


Are you missing tests for this function?

added several *_if_unchanged tests where i specify match conditions

also added test to raise when a string is passed along with match condition

…ice/_utils.py

…ts/_service/_utils.py" This reverts commit b0ca117.

* [DataLake][Bug]Upload is not working with umask and permissions (#10845) * Add force generation to SwaggerToSdk (#10933) * [formrecognizer] edits to docstrings (#11003) * edits to docstrings * correct date * updating setup template (#11022) * [formrecognizer] handle unsupervised pages better with service bug (#11017) * handle unsupervised pages better * python 2 oops * Increment package version after release of azure_ai_formrecognizer (#11026) * add regular endpoint in new env variable (#11031) * Update Ubuntu VM Image to 18.04 (#11032) * updating the VM image, need to update the recording as well. * update release * fixing merge error (#11039) * Fixing compute test (#11036) * trigger test * Packaging update of azure-mgmt-compute * fix test * fix * fix duplicated comment Co-authored-by: Azure SDK Bot <aspysdk2@microsoft.com> * Servicebus - Track2 - Remove timeout from Send (#11002) * With retry options available, send should no longer require its own timeout. Removes the parameter from sync and async clients, adds a note to changelog about the delta. * rename SearchIndexClient -> SearchClient (#10964) * Implementation for Datasources operations (#11012) * Initial Commit * lint + mypy * tests * recordings update * Apply suggestions from code review * typo * remove datasource * lint * rename to get_datasources Co-authored-by: Bryan Van de Ven <bryan@bokeh.org> * [ServiceBus] Update for readme and sample (#11047) * tweak sample code * update according to comment * add aad sample in readme * Update sdk/servicebus/azure-servicebus/README.md Co-Authored-By: KieranBrantnerMagee <kibrantn@microsoft.com> Co-authored-by: KieranBrantnerMagee <kibrantn@microsoft.com> * Fix pip link in azure-keyvault-secrets readme (#11056) * fixed alternative document input samples (#11078) * Add sync/async samples to demonstrate consuming from a number of sessions at one time. (#11001) * Add sync/async samples to demonstrate consuming from a number of sessions at one time. * Add informational message to session pool samples regarding the exit condition and how it manifests. * [ServiceBus] Settle non-deferred message through receiver link (#10800) * settle non-deferred message through receiver link except dead_letter * revert dead-letter back to t1 as well * improve settlement and put is_deferred_letter into kwargs * add test * update according to comment * fix a bug in dead_letter through receiver_link * Search README issues (#11082) * fix for azure.search.documents change * indentation, naming * SearchIndexClient -> SearchClient * Update README.md (#11084) * [ServiceBus] Remove exception from __init__.py (#11080) * remove exception from __init__.py * update changelog, fix some docstring and sample error * Pin astroid to 2.3.3 to fix pylint failure (#11088) * Lint error in cosmos (#11092) * Fix TYPING cycles if TYPE_CHECKING manually forced (#10799) * Improve mypy typing for azure core (#10653) * first commit * more changes * few changes * lint * comments * more changes * fix test * lint * mypy * comments * changes * async polling method * async * Accept authority option with or without scheme (#11050) * Split Search Service Client (#11090) * split datasources client * split skillsets client * split synonym maps client * split indexes client * cleanup * [text analytics] Add how to get json response to sample (#11102) * ARM default whitelist headers (#10940) * ARM default whitelist headers * ChangeLog * Typo * Syntax error * Update sdk/core/azure-mgmt-core/CHANGELOG.md Co-Authored-By: Jiashuo Li <jiasli@microsoft.com> * More headers Co-authored-by: Jiashuo Li <jiasli@microsoft.com> * update version (#11106) * Return pageable for Search list_indexes (#11125) * Adjust README with comments from the per-release doc review. (#11110) * Adjust README with comments from the per-release doc review. * Make additional breadcrumb to samples higher in the page, duplication is OKd (and even recommended) in this case. * Removed spurious FIFO reference. * Added a note about preview vs. existing docs, with breadcrumb to existing libs. * Make 0.50 doc links more specific. * [Event Hubs] add enqueueTime to Process span links (#10932) * remove formatter in samples/readme.md to prevent preview samples being published (#10884) * [DataLake]Update ChangeLog (#11133) * Add capability to send multiple events in one Send() call. (#11093) * Add the ability for send to take a list of messages, failing if they don't fit in a single batch to maintain idempotency. * Adds tests for multisend. * Puts details of multisend into the changelog. * Adjust docstring type definition for send() async. * Make test more targeted (256KB) for too-large validation. * Create batch helper to create from list. * Adjust docstrings to point to proper exception location instead of under common. * Fix failing unit test expecting the old send error type. * Remove test segments that will likely never be readded (queue message) and make docstring type inputs for send() more precise. * Set time out to 90 mins for regression test (#11105) * Autorest check to run tests in autorestv3 branch for core (#11131) * Autorest CI changes to use autorestv3 * Add DeleteAfter tag to Search test resource groups (#11136) * add DeleteAfter tag to RG * update recordings * Increment version for storage releases (#11138) * Increment package version after release of azure_storage_blob * Increment package version after release of azure_storage_file_datalake * [Event Hubs] `EventHubProducerClient.send_batch` accepts a list of EventData (#11079) * add ServiceDirectory to usage of remove-test-resources.yml (#11117) * resume subscriptions test (#11111) * resume subscriptions test * recording subscriptions * Adding test for signalr (#11146) * generated signalr test * generated recording * Packaging update of azure-mgmt-signalr Co-authored-by: Azure SDK Bot <aspysdk2@microsoft.com> * update live tests yml + add form (#11139) * [Service Bus] Exception Handling review (#11060) * [form recognizer] add repr (#11150) * [ServiceBus] Support for scheduling and cancellation (#11095) * make schedule a property on the message * make send api public * schedule and cancellation * remove iterable type hint and docstring * update implementation * update comment * update docs * Update sdk/servicebus/azure-servicebus/CHANGELOG.md Co-authored-by: KieranBrantnerMagee <kibrantn@microsoft.com> Co-authored-by: KieranBrantnerMagee <kibrantn@microsoft.com> * identity_vscode_credential (#10840) * identity_win_vscode_credential Co-authored-by: Charles Lowell <chlowe@microsoft.com> * Sync eng/common directory with azure-sdk-tools repository (#11007) * ChangeLog generics for autorest v5 (#10885) * ChangeLog generics for autorest v5 * Update changelog_generics.md * [Event Hubs] Add params in stress test command line for receive batch and send list (#11161) * Storageache cjf (#11122) * Update from master * release azure-mgmt-storagecache * Update CHANGELOG.md * Packaging update of azure-mgmt-storagecache Co-authored-by: SDK Automation <sdkautomation@microsoft.com> Co-authored-by: Your Name <you@example.com> Co-authored-by: Azure SDK Bot <aspysdk2@microsoft.com> * added AzureKeyCredential link to readme (#11089) * Fix core auth (#11177) * [Azure-Core]Auth Header missing when token credential is not expired * Fix mypy * Test we put the header even if we didn't tech a new token Co-authored-by: xiafu <xiafu@microsoft.com> * [formrecognizer] increase test coverage (#11096) * working on more tests * add multipage tests for custom form and training * adding multipage tests * fix * add tests for bad input into custom analyze * remove test dependency on storage * update tests.yml * fix for custom analyze url unlabeled tests * update changelog * review feedback * pushing a commit to reset CI * Release edits for Search (#11178) * fix README typo * Getting started section order * add first search request subsection * update CHANGELOG * update readme with note about service version support (#11180) * [Event Hubs] Fix a bug that sets owner level 0 (#11172) * [ServiceBus] Docstring and Changelog adjustment (#11166) * Identity use pbyte (#11173) * identity_vscode_cred_format * EnvironmentCredential correctly initializes UsernamePasswordCredential (#11127) * User authentication API for applications (#10612) * [Event Hubs] Version/Docs adjustment for 5.1.0 (#11179) * [form recognizer] Add some stuff that .net has to our samples (#11187) * re-enable schedule tests in session (#11184) * add helpers for search fields (#11164) * add helpers for search fields * pylint * fix annotation * Define match conditions for CreateOrUpdate and Delete operations (#11116) * sync * async * lint * Update sdk/search/azure-search-documents/azure/search/documents/_service/_datasources_client.py * tests fix * use match conditiond * error map * fix test * lint * comments * test_utils * Update sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py * Update sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py Co-authored-by: Johan Stenberg (MSFT) <johan.stenberg@microsoft.com> * Update sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py * Revert "Update sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py" This reverts commit b0ca117. * fix * more changes Co-authored-by: Johan Stenberg (MSFT) <johan.stenberg@microsoft.com> Co-authored-by: Xiaoxi Fu <49707495+xiafu-msft@users.noreply.github.com> Co-authored-by: Laurent Mazuel <laurent.mazuel@gmail.com> Co-authored-by: Krista Pratico <krpratic@microsoft.com> Co-authored-by: Zim Kalinowski <zikalino@microsoft.com> Co-authored-by: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Co-authored-by: iscai-msft <43154838+iscai-msft@users.noreply.github.com> Co-authored-by: Scott Beddall <45376673+scbedd@users.noreply.github.com> Co-authored-by: Azure SDK Bot <aspysdk2@microsoft.com> Co-authored-by: KieranBrantnerMagee <kibrantn@microsoft.com> Co-authored-by: Bryan Van de Ven <bryan@bokeh.org> Co-authored-by: Rakshith Bhyravabhotla <rakshith.bhyravabhotla@gmail.com> Co-authored-by: Adam Ling (MSFT) <47871814+yunhaoling@users.noreply.github.com> Co-authored-by: Charles Lowell <chlowe@microsoft.com> Co-authored-by: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com> Co-authored-by: Rakshith Bhyravabhotla <sabhyrav@microsoft.com> Co-authored-by: Jiashuo Li <jiasli@microsoft.com> Co-authored-by: Yijun Xie <48257664+YijunXieMS@users.noreply.github.com> Co-authored-by: Daniel Jurek <djurek@microsoft.com> Co-authored-by: changlong-liu <59815250+changlong-liu@users.noreply.github.com> Co-authored-by: 陈箭飞 <32889038+chenjianfei2017@users.noreply.github.com> Co-authored-by: SDK Automation <sdkautomation@microsoft.com> Co-authored-by: Your Name <you@example.com> Co-authored-by: xiafu <xiafu@microsoft.com> Co-authored-by: Johan Stenberg (MSFT) <johan.stenberg@microsoft.com>

rakshith91 requested review from lmazuel and mayurid as code owners April 29, 2020 05:55

rakshith91 commented Apr 29, 2020

View reviewed changes

sdk/search/azure-search-documents/azure/search/documents/_service/_datasources_client.py Outdated Show resolved Hide resolved

rakshith91 commented Apr 29, 2020

View reviewed changes

rakshith91 self-assigned this Apr 29, 2020

rakshith91 requested review from bryevdv, johanste and heaths April 29, 2020 18:30

heaths reviewed Apr 29, 2020

View reviewed changes

rakshith91 and others added 4 commits April 29, 2020 17:38

sync

60d8822

async

722fd37

lint

92207f7

Update sdk/search/azure-search-documents/azure/search/documents/_serv…

288b46b

…ice/_datasources_client.py

rakshith91 force-pushed the match_con branch from 15ca801 to 288b46b Compare April 30, 2020 00:40

johanste reviewed Apr 30, 2020

View reviewed changes

sdk/search/azure-search-documents/azure/search/documents/_service/_datasources_client.py Outdated Show resolved Hide resolved

rakshith91 added 5 commits April 30, 2020 02:00

tests fix

96d1318

use match conditiond

f026a13

error map

4e01084

fix test

146b6b3

lint

a144727

bryevdv reviewed May 1, 2020

View reviewed changes

sdk/search/azure-search-documents/tests/test_service_live.py Outdated Show resolved Hide resolved

bryevdv reviewed May 1, 2020

View reviewed changes

sdk/search/azure-search-documents/tests/test_service_live.py Outdated Show resolved Hide resolved

bryevdv reviewed May 1, 2020

View reviewed changes

sdk/search/azure-search-documents/tests/test_service_live.py Outdated Show resolved Hide resolved

comments

79da71a

bryevdv reviewed May 1, 2020

View reviewed changes

sdk/search/azure-search-documents/tests/async_tests/test_service_live_async.py Outdated Show resolved Hide resolved

bryevdv mentioned this pull request May 1, 2020

Implementation for indexers operations #11144

Merged

test_utils

24b2180

bryevdv previously approved these changes May 1, 2020

View reviewed changes

johanste reviewed May 1, 2020

View reviewed changes

sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py Outdated Show resolved Hide resolved

johanste reviewed May 1, 2020

View reviewed changes

sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py Show resolved Hide resolved

rakshith91 commented May 1, 2020

View reviewed changes

sdk/search/azure-search-documents/azure/search/documents/_service/_utils.py Show resolved Hide resolved

Update sdk/search/azure-search-documents/azure/search/documents/_serv…

0a84da3

…ice/_utils.py

rakshith91 dismissed bryevdv’s stale review via 0a84da3 May 1, 2020 20:06

rakshith91 changed the title ~~Define onlyIfUnchanged parameter for CreateOrUpdate and Delete operations~~ Define match conditions for CreateOrUpdate and Delete operations May 1, 2020

Update sdk/search/azure-search-documents/azure/search/documents/_serv…

4a3e126

…ice/_utils.py Co-authored-by: Johan Stenberg (MSFT) <johan.stenberg@microsoft.com>

johanste reviewed May 1, 2020

View reviewed changes

Rakshith Bhyravabhotla and others added 4 commits May 1, 2020 14:48

Update sdk/search/azure-search-documents/azure/search/documents/_serv…

b0ca117

…ice/_utils.py

Revert "Update sdk/search/azure-search-documents/azure/search/documen…

756fd7a

…ts/_service/_utils.py" This reverts commit b0ca117.

fix

e8203d7

more changes

139c208

bryevdv previously approved these changes May 1, 2020

View reviewed changes

Merge branch 'master' into match_con

63c1328

rakshith91 dismissed bryevdv’s stale review via 63c1328 May 1, 2020 22:38

bryevdv approved these changes May 1, 2020

View reviewed changes

rakshith91 merged commit 0a90eca into Azure:master May 1, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Define match conditions for CreateOrUpdate and Delete operations #11116

Define match conditions for CreateOrUpdate and Delete operations #11116

rakshith91 commented Apr 29, 2020 •

edited

Loading

rakshith91 Apr 29, 2020 •

edited

Loading

johanste May 1, 2020

rakshith91 May 1, 2020

heaths left a comment

rakshith91 commented May 1, 2020

bryevdv commented May 1, 2020

rakshith91 commented May 1, 2020

azure-pipelines bot commented May 1, 2020

rakshith91 commented May 1, 2020

azure-pipelines bot commented May 1, 2020

johanste May 1, 2020

rakshith91 May 1, 2020

rakshith91 May 1, 2020

Define match conditions for CreateOrUpdate and Delete operations #11116

Define match conditions for CreateOrUpdate and Delete operations #11116

Conversation

rakshith91 commented Apr 29, 2020 • edited Loading

rakshith91 Apr 29, 2020 • edited Loading

Choose a reason for hiding this comment

johanste May 1, 2020

Choose a reason for hiding this comment

rakshith91 May 1, 2020

Choose a reason for hiding this comment

heaths left a comment

Choose a reason for hiding this comment

rakshith91 commented May 1, 2020

bryevdv commented May 1, 2020

rakshith91 commented May 1, 2020

azure-pipelines bot commented May 1, 2020

rakshith91 commented May 1, 2020

azure-pipelines bot commented May 1, 2020

johanste May 1, 2020

Choose a reason for hiding this comment

rakshith91 May 1, 2020

Choose a reason for hiding this comment

rakshith91 May 1, 2020

Choose a reason for hiding this comment

rakshith91 commented Apr 29, 2020 •

edited

Loading

rakshith91 Apr 29, 2020 •

edited

Loading