From 46bfa1206aff31261819e443fae09803e0bd2098 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 6 Nov 2019 10:16:27 -0800 Subject: [PATCH 1/5] set read only change --- .../azure-appconfiguration/HISTORY.md | 6 ++ .../_azure_appconfiguration_client.py | 67 ++++++------------- .../aio/_azure_configuration_client_async.py | 67 ++++++------------- .../azure-appconfiguration/samples/README.md | 2 +- .../samples/read_only_async_sample.py | 6 +- .../samples/read_only_sample.py | 6 +- .../tests/TestKeyValueAsync.py | 56 ++++++++++++++++ .../tests/TestKeyValueSync.py | 55 +++++++++++++++ .../tests/TestKeyValueTracingSync.py | 64 ++++++++++++++++++ .../app_config_asynctests/async_proxy.py | 9 +-- .../test_azure_configuration_client_async.py | 6 +- .../tests/test_azure_configuration_client.py | 6 +- 12 files changed, 234 insertions(+), 116 deletions(-) create mode 100644 sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueAsync.py create mode 100644 sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueSync.py create mode 100644 sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueTracingSync.py diff --git a/sdk/appconfiguration/azure-appconfiguration/HISTORY.md b/sdk/appconfiguration/azure-appconfiguration/HISTORY.md index dcee42dec0cd..761082c7f75a 100644 --- a/sdk/appconfiguration/azure-appconfiguration/HISTORY.md +++ b/sdk/appconfiguration/azure-appconfiguration/HISTORY.md @@ -3,6 +3,12 @@ ------------------- +## 2019-12-xx Version 1.0.0b6 + +### Breaking changes + +- Combine set_read_only & clear_read_only to be set_read_only(Ture/False) + ## 2019-10-30 Version 1.0.0b5 ### Breaking changes diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py index 3f3e6067ae89..c00c7182022d 100644 --- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py +++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py @@ -471,13 +471,15 @@ def list_revisions( @distributed_trace def set_read_only( - self, configuration_setting, **kwargs - ): # type: (ConfigurationSetting, dict) -> ConfigurationSetting + self, configuration_setting, read_only = True, **kwargs + ): # type: (ConfigurationSetting, Optional[bool], dict) -> ConfigurationSetting """Set a configuration setting read only :param configuration_setting: the ConfigurationSetting to be set read only :type configuration_setting: :class:`ConfigurationSetting` + :param read_only: set the read only setting if true, else clear the read only setting + :type read_only: bool :keyword dict headers: if "headers" exists, its value (a dict) will be added to the http request header :return: The ConfigurationSetting returned from the service :rtype: :class:`ConfigurationSetting` @@ -492,6 +494,7 @@ def set_read_only( ) read_only_config_setting = client.set_read_only(config_setting) + read_only_config_setting = client.set_read_only(config_setting, read_only=False) """ error_map = { 401: ClientAuthenticationError, @@ -499,52 +502,20 @@ def set_read_only( } try: - key_value = self._impl.put_lock( - key=configuration_setting.key, - label=configuration_setting.label, - error_map=error_map, - **kwargs - ) - return ConfigurationSetting._from_key_value(key_value) - except ErrorException as error: - raise HttpResponseError(message=error.message, response=error.response) - - @distributed_trace - def clear_read_only( - self, configuration_setting, **kwargs - ): # type: (ConfigurationSetting, dict) -> ConfigurationSetting - - """Clear read only flag for a configuration setting - - :param configuration_setting: the ConfigurationSetting to be read only clear - :type configuration_setting: :class:`ConfigurationSetting` - :keyword dict headers: if "headers" exists, its value (a dict) will be added to the http request header - :return: The ConfigurationSetting returned from the service - :rtype: :class:`ConfigurationSetting` - :raises: :class:`HttpResponseError`, :class:`ClientAuthenticationError`, :class:`ResourceNotFoundError` - - Example - - .. code-block:: python - - config_setting = client.get_configuration_setting( - key="MyKey", label="MyLabel" - ) - - read_only_config_setting = client.clear_read_only(config_setting) - """ - error_map = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError - } - - try: - key_value = self._impl.delete_lock( - key=configuration_setting.key, - label=configuration_setting.label, - error_map=error_map, - **kwargs - ) + if read_only: + key_value = self._impl.put_lock( + key=configuration_setting.key, + label=configuration_setting.label, + error_map=error_map, + **kwargs + ) + else: + key_value = self._impl.delete_lock( + key=configuration_setting.key, + label=configuration_setting.label, + error_map=error_map, + **kwargs + ) return ConfigurationSetting._from_key_value(key_value) except ErrorException as error: raise HttpResponseError(message=error.message, response=error.response) diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py index ddc530bbed41..c9c6b93e7c02 100644 --- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py +++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py @@ -487,13 +487,15 @@ def list_revisions( @distributed_trace async def set_read_only( - self, configuration_setting, **kwargs - ): # type: (ConfigurationSetting, dict) -> ConfigurationSetting + self, configuration_setting, read_only = True, **kwargs + ): # type: (ConfigurationSetting, Optional[bool], dict) -> ConfigurationSetting """Set a configuration setting read only :param configuration_setting: the ConfigurationSetting to be set read only :type configuration_setting: :class:`ConfigurationSetting` + :param read_only: set the read only setting if true, else clear the read only setting + :type read_only: bool :keyword dict headers: if "headers" exists, its value (a dict) will be added to the http request header :return: The ConfigurationSetting returned from the service :rtype: :class:`ConfigurationSetting` @@ -508,6 +510,7 @@ async def set_read_only( ) read_only_config_setting = await async_client.set_read_only(config_setting) + read_only_config_setting = await client.set_read_only(config_setting, read_only=False) """ error_map = { 401: ClientAuthenticationError, @@ -515,52 +518,20 @@ async def set_read_only( } try: - key_value = await self._impl.put_lock( - key=configuration_setting.key, - label=configuration_setting.label, - error_map=error_map, - **kwargs - ) - return ConfigurationSetting._from_key_value(key_value) - except ErrorException as error: - raise HttpResponseError(message=error.message, response=error.response) - - @distributed_trace - async def clear_read_only( - self, configuration_setting, **kwargs - ): # type: (ConfigurationSetting, dict) -> ConfigurationSetting - - """Clear read only flag for a configuration setting - - :param configuration_setting: the ConfigurationSetting to be read only clear - :type configuration_setting: :class:`ConfigurationSetting` - :keyword dict headers: if "headers" exists, its value (a dict) will be added to the http request header - :return: The ConfigurationSetting returned from the service - :rtype: :class:`ConfigurationSetting` - :raises: :class:`HttpResponseError`, :class:`ClientAuthenticationError`, :class:`ResourceNotFoundError` - - Example - - .. code-block:: python - - config_setting = await async_client.get_configuration_setting( - key="MyKey", label="MyLabel" - ) - - read_only_config_setting = await async_client.clear_read_only(config_setting) - """ - error_map = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError - } - - try: - key_value = await self._impl.delete_lock( - key=configuration_setting.key, - label=configuration_setting.label, - error_map=error_map, - **kwargs - ) + if read_only: + key_value = await self._impl.put_lock( + key=configuration_setting.key, + label=configuration_setting.label, + error_map=error_map, + **kwargs + ) + else: + key_value = await self._impl.delete_lock( + key=configuration_setting.key, + label=configuration_setting.label, + error_map=error_map, + **kwargs + ) return ConfigurationSetting._from_key_value(key_value) except ErrorException as error: raise HttpResponseError(message=error.message, response=error.response) diff --git a/sdk/appconfiguration/azure-appconfiguration/samples/README.md b/sdk/appconfiguration/azure-appconfiguration/samples/README.md index 1bf54e61b328..86d549dc16e4 100644 --- a/sdk/appconfiguration/azure-appconfiguration/samples/README.md +++ b/sdk/appconfiguration/azure-appconfiguration/samples/README.md @@ -34,7 +34,7 @@ pip install azure-appconfiguration | hello_world_sample.py / hello_world_async_sample.py | demos set/get/delete operations | | hello_world_advanced_sample.py / hello_world_advanced_async_sample.py | demos add/set with label/list operations | | conditional_operation_sample.py / conditional_operation_async_sample.py | demos conditional set/get/delete operations | -| read_only_sample.py / read_only_async_sample.py | demos set_read_only/clear_read_only operations | +| read_only_sample.py / read_only_async_sample.py | demos set_read_only operations | | list_revision_sample.py / list_revision_async_sample.py | demos list revision operations | diff --git a/sdk/appconfiguration/azure-appconfiguration/samples/read_only_async_sample.py b/sdk/appconfiguration/azure-appconfiguration/samples/read_only_async_sample.py index 490a0977001c..58b7d4e8fcaa 100644 --- a/sdk/appconfiguration/azure-appconfiguration/samples/read_only_async_sample.py +++ b/sdk/appconfiguration/azure-appconfiguration/samples/read_only_async_sample.py @@ -9,7 +9,7 @@ """ FILE: read_only_async_sample.py DESCRIPTION: - This sample demos set_read_only/clear_read_only operations for app configuration + This sample demos set_read_only operations for app configuration USAGE: python read_only_async_sample.py """ @@ -44,8 +44,8 @@ async def main(): print("") print("Clear read only configuration setting:") - read_write_config_setting = await client.clear_read_only( - returned_config_setting + read_write_config_setting = await client.set_read_only( + returned_config_setting, False ) print_configuration_setting(read_write_config_setting) print("") diff --git a/sdk/appconfiguration/azure-appconfiguration/samples/read_only_sample.py b/sdk/appconfiguration/azure-appconfiguration/samples/read_only_sample.py index bb851b182eca..7b73192f5508 100644 --- a/sdk/appconfiguration/azure-appconfiguration/samples/read_only_sample.py +++ b/sdk/appconfiguration/azure-appconfiguration/samples/read_only_sample.py @@ -9,7 +9,7 @@ """ FILE: read_only_sample.py DESCRIPTION: - This sample demos set_read_only/clear_read_only operations for app configuration + This sample demos set_read_only operations for app configuration USAGE: python read_only_sample.py """ @@ -42,8 +42,8 @@ def main(): print("") print("Clear read only configuration setting:") - read_write_config_setting = client.clear_read_only( - returned_config_setting + read_write_config_setting = client.set_read_only( + returned_config_setting, False ) print_configuration_setting(read_write_config_setting) print("") diff --git a/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueAsync.py b/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueAsync.py new file mode 100644 index 000000000000..f38494c4f818 --- /dev/null +++ b/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueAsync.py @@ -0,0 +1,56 @@ +from configuration import ConfigurationSetting +from configuration.aio import AzureConfigurationClientAsync +import os +import asyncio + +async def main(): + connection_string = os.environ['AZCONFIG_CONNECTION_STRING'] + print(connection_string) + + client = AzureConfigurationClientAsync(connection_string) + + # keyvalue1 = client.get_key_value('test1') + # print(keyvalue1.value) + newkeyvalue = ConfigurationSetting() + newkeyvalue.key = "test2" + newkeyvalue.value = "aaa" + newkeyvalue.content_type = "testtype" + newkeyvalue.tags = { + "tag1": "value1", + "tag2": "value2", + } + await client.delete_configuration_setting('test2') + await client.add_configuration_setting(newkeyvalue) + keyvalue2 = await client.get_configuration_setting('test2') + print(keyvalue2.value) + newkeyvalue1 = ConfigurationSetting() + newkeyvalue1.key="test2" + newkeyvalue1.value="bbb" + newkeyvalue1.label='' + newkeyvalue1.content_type="testtype" + newkeyvalue1.tags={ + "tag1": "value1", + "tag2": "value2", + } + temp = await client.update_configuration_setting(key='test2', value="bbb") + keyvalue3 = await client.get_configuration_setting('test2') + print(keyvalue3.value) + # client.key_values.delete('test2') + # client.key_values.delete('test3') + # keyvalue4 = client.key_values.get('test2') + # print(keyvalue4.value) + + keyvalue5 = await client.lock_configuration_setting("test2") + print(keyvalue5.locked) + + keyvalue6 = await client.unlock_configuration_setting("test2") + print(keyvalue6.locked) + + #keyvalues = list(client.list_key_values('test2')) + #currentkeyvalue = keyvalues[0] + + #print(currentkeyvalue) + +if __name__ == "__main__": + loop = asyncio.get_event_loop() + loop.run_until_complete(main()) \ No newline at end of file diff --git a/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueSync.py b/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueSync.py new file mode 100644 index 000000000000..8e1749414817 --- /dev/null +++ b/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueSync.py @@ -0,0 +1,55 @@ +import os +from azure.appconfiguration import AzureAppConfigurationClient, ConfigurationSetting + +def main(): + connection_string = os.environ['AZCONFIG_CONNECTION_STRING'] + print(connection_string) + + client = AzureAppConfigurationClient.from_connection_string(connection_string) + + # keyvalue1 = client.get_key_value('test1') + # print(keyvalue1.value) + #newkeyvalue = ConfigurationSetting() + #newkeyvalue.key = "test2" + #newkeyvalue.value = "aaa" + #newkeyvalue.content_type = "testtype" + #newkeyvalue.tags = { + # "tag1": "value1", + # "tag2": "value2", + # } + #client.delete_configuration_setting('test2') + #client.add_configuration_setting(newkeyvalue) + #client.add_configuration_setting(newkeyvalue) + #keyvalue2 = client.get_configuration_setting('test2') + #print(keyvalue2.value) + #newkeyvalue1 = ConfigurationSetting() + #newkeyvalue1.key="test2" + #newkeyvalue1.value="bbb" + #newkeyvalue1.label='' + #newkeyvalue1.content_type="testtype" + #newkeyvalue1.tags={ + # "tag1": "value1", + # "tag2": "value2", + # } + #temp = client.update_configuration_setting(key='test2', value="bbb") + #temp = client.add_key_value(newkeyvalue1) + #keyvalue3 = client.get_configuration_setting('test2') + #print(keyvalue3.value) + # client.key_values.delete('test2') + # client.key_values.delete('test3') + # keyvalue4 = client.key_values.get('test2') + # print(keyvalue4.value) + + #keyvalue5 = client.lock_configuration_setting("test2") + #print(keyvalue5.locked) + + #keyvalue6 = client.unlock_configuration_setting("test2") + #print(keyvalue6.locked) + + keyvalues = list(client.list_revisions('test2')) + currentkeyvalue = keyvalues[0] + + #print(currentkeyvalue) + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueTracingSync.py b/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueTracingSync.py new file mode 100644 index 000000000000..046bb02b445c --- /dev/null +++ b/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueTracingSync.py @@ -0,0 +1,64 @@ +import os +from azure.appconfiguration import AzureAppConfigurationClient, ConfigurationSetting +from opencensus.ext.azure.trace_exporter import AzureExporter +from opencensus.trace.tracer import Tracer +from opencensus.trace.samplers import AlwaysOnSampler + +def main(): + connection_string = os.environ['AZURE_APPCONFIG_CONNECTION_STRING'] + print(connection_string) + + exporter = AzureExporter( + instrumentation_key="4ab2a2c3-5590-4b5f-a075-77a994c1bc3c" + ) + + tracer = Tracer(exporter=exporter, sampler=AlwaysOnSampler()) + with tracer.span(name="azconfig") as span: + client = AzureAppConfigurationClient.from_connection_string(connection_string) + #keyvalue1 = client.get_key_value('tracing1') + #print(keyvalue1.value) + newkeyvalue = ConfigurationSetting() + newkeyvalue.key = "tracing1" + newkeyvalue.value = "aaa" + newkeyvalue.content_type = "testtype" + newkeyvalue.tags = { + "tag1": "value1", + "tag2": "value2", + } + #client.delete_configuration_setting('test2') + client.add_configuration_setting(newkeyvalue) + #client.add_configuration_setting(newkeyvalue) + keyvalue2 = client.get_configuration_setting('tracing1') + print(keyvalue2.value) + client.delete_configuration_setting('tracing1') + #newkeyvalue1 = ConfigurationSetting() + #newkeyvalue1.key="test2" + #newkeyvalue1.value="bbb" + #newkeyvalue1.label='' + #newkeyvalue1.content_type="testtype" + #newkeyvalue1.tags={ + # "tag1": "value1", + # "tag2": "value2", + # } + #temp = client.update_configuration_setting(key='test2', value="bbb") + #temp = client.add_key_value(newkeyvalue1) + #keyvalue3 = client.get_configuration_setting('test2') + #print(keyvalue3.value) + # client.key_values.delete('test2') + # client.key_values.delete('test3') + # keyvalue4 = client.key_values.get('test2') + # print(keyvalue4.value) + + #keyvalue5 = client.lock_configuration_setting("test2") + #print(keyvalue5.locked) + + #keyvalue6 = client.unlock_configuration_setting("test2") + #print(keyvalue6.locked) + + #keyvalues = list(client.list_revisions('test2')) + #currentkeyvalue = keyvalues[0] + + #print(currentkeyvalue) + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/sdk/appconfiguration/azure-appconfiguration/tests/app_config_asynctests/async_proxy.py b/sdk/appconfiguration/azure-appconfiguration/tests/app_config_asynctests/async_proxy.py index e42f8468c153..f8f2ad5611f4 100644 --- a/sdk/appconfiguration/azure-appconfiguration/tests/app_config_asynctests/async_proxy.py +++ b/sdk/appconfiguration/azure-appconfiguration/tests/app_config_asynctests/async_proxy.py @@ -76,12 +76,7 @@ def set_configuration_setting(self, configuration_setting, **kwargs): self.obj.set_configuration_setting(configuration_setting, **kwargs) ) - def set_read_only(self, configuration_setting, **kwargs): + def set_read_only(self, configuration_setting, read_only=True, **kwargs): return get_event_loop().run_until_complete( - self.obj.set_read_only(configuration_setting, **kwargs) - ) - - def clear_read_only(self, configuration_setting, **kwargs): - return get_event_loop().run_until_complete( - self.obj.clear_read_only(configuration_setting, **kwargs) + self.obj.set_read_only(configuration_setting, read_only, **kwargs) ) diff --git a/sdk/appconfiguration/azure-appconfiguration/tests/app_config_asynctests/test_azure_configuration_client_async.py b/sdk/appconfiguration/azure-appconfiguration/tests/app_config_asynctests/test_azure_configuration_client_async.py index 9b418c679e24..29e03c1f0f0a 100644 --- a/sdk/appconfiguration/azure-appconfiguration/tests/app_config_asynctests/test_azure_configuration_client_async.py +++ b/sdk/appconfiguration/azure-appconfiguration/tests/app_config_asynctests/test_azure_configuration_client_async.py @@ -348,7 +348,7 @@ def test_read_only(self): kv = self.test_config_setting_no_label read_only_kv = self.get_config_client().set_read_only(kv) assert read_only_kv.read_only - readable_kv = self.get_config_client().clear_read_only(read_only_kv) + readable_kv = self.get_config_client().set_read_only(read_only_kv, False) assert not readable_kv.read_only def test_delete_read_only(self): @@ -356,7 +356,7 @@ def test_delete_read_only(self): read_only_kv = self.get_config_client().set_read_only(to_delete_kv) with pytest.raises(ResourceReadOnlyError): self.get_config_client().delete_configuration_setting(to_delete_kv.key) - self.get_config_client().clear_read_only(read_only_kv) + self.get_config_client().set_read_only(read_only_kv, False) self.get_config_client().delete_configuration_setting(to_delete_kv.key) self.to_delete.remove(to_delete_kv) with pytest.raises(ResourceNotFoundError): @@ -369,7 +369,7 @@ def test_set_read_only(self): read_only_kv = self.get_config_client().set_read_only(to_set_kv) with pytest.raises(ResourceReadOnlyError): self.get_config_client().set_configuration_setting(read_only_kv) - readable_kv = self.get_config_client().clear_read_only(read_only_kv) + readable_kv = self.get_config_client().set_read_only(read_only_kv, False) readable_kv.value = to_set_kv.value readable_kv.tags = to_set_kv.tags set_kv = self.get_config_client().set_configuration_setting(readable_kv) diff --git a/sdk/appconfiguration/azure-appconfiguration/tests/test_azure_configuration_client.py b/sdk/appconfiguration/azure-appconfiguration/tests/test_azure_configuration_client.py index bf7c62b331e3..a541172f2038 100644 --- a/sdk/appconfiguration/azure-appconfiguration/tests/test_azure_configuration_client.py +++ b/sdk/appconfiguration/azure-appconfiguration/tests/test_azure_configuration_client.py @@ -347,7 +347,7 @@ def test_read_only(self): kv = self.test_config_setting_no_label read_only_kv = self.get_config_client().set_read_only(kv) assert read_only_kv.read_only - readable_kv = self.get_config_client().clear_read_only(read_only_kv) + readable_kv = self.get_config_client().set_read_only(read_only_kv, False) assert not readable_kv.read_only def test_delete_read_only(self): @@ -355,7 +355,7 @@ def test_delete_read_only(self): read_only_kv = self.get_config_client().set_read_only(to_delete_kv) with pytest.raises(ResourceReadOnlyError): self.get_config_client().delete_configuration_setting(to_delete_kv.key) - self.get_config_client().clear_read_only(read_only_kv) + self.get_config_client().set_read_only(read_only_kv, False) self.get_config_client().delete_configuration_setting(to_delete_kv.key) self.to_delete.remove(to_delete_kv) with pytest.raises(ResourceNotFoundError): @@ -368,7 +368,7 @@ def test_set_read_only(self): read_only_kv = self.get_config_client().set_read_only(to_set_kv) with pytest.raises(ResourceReadOnlyError): self.get_config_client().set_configuration_setting(read_only_kv) - readable_kv = self.get_config_client().clear_read_only(read_only_kv) + readable_kv = self.get_config_client().set_read_only(read_only_kv, False) readable_kv.value = to_set_kv.value readable_kv.tags = to_set_kv.tags set_kv = self.get_config_client().set_configuration_setting(readable_kv) From c553d3584ad6b7f4697e165736126e55d3750366 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 6 Nov 2019 10:29:44 -0800 Subject: [PATCH 2/5] make pylint happy --- .../azure/appconfiguration/_azure_appconfiguration_client.py | 2 +- .../appconfiguration/aio/_azure_configuration_client_async.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py index c00c7182022d..a09eb5041888 100644 --- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py +++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py @@ -471,7 +471,7 @@ def list_revisions( @distributed_trace def set_read_only( - self, configuration_setting, read_only = True, **kwargs + self, configuration_setting, read_only=True, **kwargs ): # type: (ConfigurationSetting, Optional[bool], dict) -> ConfigurationSetting """Set a configuration setting read only diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py index c9c6b93e7c02..2d06ae4d9d2e 100644 --- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py +++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py @@ -487,7 +487,7 @@ def list_revisions( @distributed_trace async def set_read_only( - self, configuration_setting, read_only = True, **kwargs + self, configuration_setting, read_only=True, **kwargs ): # type: (ConfigurationSetting, Optional[bool], dict) -> ConfigurationSetting """Set a configuration setting read only From e12a1708220e1fdb2d6f02adc6040517e6f2a092 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 6 Nov 2019 10:30:30 -0800 Subject: [PATCH 3/5] add PR # --- sdk/appconfiguration/azure-appconfiguration/HISTORY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/appconfiguration/azure-appconfiguration/HISTORY.md b/sdk/appconfiguration/azure-appconfiguration/HISTORY.md index 761082c7f75a..3ec34aba3312 100644 --- a/sdk/appconfiguration/azure-appconfiguration/HISTORY.md +++ b/sdk/appconfiguration/azure-appconfiguration/HISTORY.md @@ -7,7 +7,7 @@ ### Breaking changes -- Combine set_read_only & clear_read_only to be set_read_only(Ture/False) +- Combine set_read_only & clear_read_only to be set_read_only(Ture/False) #8453 ## 2019-10-30 Version 1.0.0b5 From c3a33cc70f1dca055cc7fb688eedea677a5044db Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 6 Nov 2019 10:53:50 -0800 Subject: [PATCH 4/5] delete unwanted tests --- .../tests/TestKeyValueAsync.py | 56 ---------------- .../tests/TestKeyValueSync.py | 55 ---------------- .../tests/TestKeyValueTracingSync.py | 64 ------------------- 3 files changed, 175 deletions(-) delete mode 100644 sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueAsync.py delete mode 100644 sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueSync.py delete mode 100644 sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueTracingSync.py diff --git a/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueAsync.py b/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueAsync.py deleted file mode 100644 index f38494c4f818..000000000000 --- a/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueAsync.py +++ /dev/null @@ -1,56 +0,0 @@ -from configuration import ConfigurationSetting -from configuration.aio import AzureConfigurationClientAsync -import os -import asyncio - -async def main(): - connection_string = os.environ['AZCONFIG_CONNECTION_STRING'] - print(connection_string) - - client = AzureConfigurationClientAsync(connection_string) - - # keyvalue1 = client.get_key_value('test1') - # print(keyvalue1.value) - newkeyvalue = ConfigurationSetting() - newkeyvalue.key = "test2" - newkeyvalue.value = "aaa" - newkeyvalue.content_type = "testtype" - newkeyvalue.tags = { - "tag1": "value1", - "tag2": "value2", - } - await client.delete_configuration_setting('test2') - await client.add_configuration_setting(newkeyvalue) - keyvalue2 = await client.get_configuration_setting('test2') - print(keyvalue2.value) - newkeyvalue1 = ConfigurationSetting() - newkeyvalue1.key="test2" - newkeyvalue1.value="bbb" - newkeyvalue1.label='' - newkeyvalue1.content_type="testtype" - newkeyvalue1.tags={ - "tag1": "value1", - "tag2": "value2", - } - temp = await client.update_configuration_setting(key='test2', value="bbb") - keyvalue3 = await client.get_configuration_setting('test2') - print(keyvalue3.value) - # client.key_values.delete('test2') - # client.key_values.delete('test3') - # keyvalue4 = client.key_values.get('test2') - # print(keyvalue4.value) - - keyvalue5 = await client.lock_configuration_setting("test2") - print(keyvalue5.locked) - - keyvalue6 = await client.unlock_configuration_setting("test2") - print(keyvalue6.locked) - - #keyvalues = list(client.list_key_values('test2')) - #currentkeyvalue = keyvalues[0] - - #print(currentkeyvalue) - -if __name__ == "__main__": - loop = asyncio.get_event_loop() - loop.run_until_complete(main()) \ No newline at end of file diff --git a/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueSync.py b/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueSync.py deleted file mode 100644 index 8e1749414817..000000000000 --- a/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueSync.py +++ /dev/null @@ -1,55 +0,0 @@ -import os -from azure.appconfiguration import AzureAppConfigurationClient, ConfigurationSetting - -def main(): - connection_string = os.environ['AZCONFIG_CONNECTION_STRING'] - print(connection_string) - - client = AzureAppConfigurationClient.from_connection_string(connection_string) - - # keyvalue1 = client.get_key_value('test1') - # print(keyvalue1.value) - #newkeyvalue = ConfigurationSetting() - #newkeyvalue.key = "test2" - #newkeyvalue.value = "aaa" - #newkeyvalue.content_type = "testtype" - #newkeyvalue.tags = { - # "tag1": "value1", - # "tag2": "value2", - # } - #client.delete_configuration_setting('test2') - #client.add_configuration_setting(newkeyvalue) - #client.add_configuration_setting(newkeyvalue) - #keyvalue2 = client.get_configuration_setting('test2') - #print(keyvalue2.value) - #newkeyvalue1 = ConfigurationSetting() - #newkeyvalue1.key="test2" - #newkeyvalue1.value="bbb" - #newkeyvalue1.label='' - #newkeyvalue1.content_type="testtype" - #newkeyvalue1.tags={ - # "tag1": "value1", - # "tag2": "value2", - # } - #temp = client.update_configuration_setting(key='test2', value="bbb") - #temp = client.add_key_value(newkeyvalue1) - #keyvalue3 = client.get_configuration_setting('test2') - #print(keyvalue3.value) - # client.key_values.delete('test2') - # client.key_values.delete('test3') - # keyvalue4 = client.key_values.get('test2') - # print(keyvalue4.value) - - #keyvalue5 = client.lock_configuration_setting("test2") - #print(keyvalue5.locked) - - #keyvalue6 = client.unlock_configuration_setting("test2") - #print(keyvalue6.locked) - - keyvalues = list(client.list_revisions('test2')) - currentkeyvalue = keyvalues[0] - - #print(currentkeyvalue) - -if __name__ == "__main__": - main() \ No newline at end of file diff --git a/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueTracingSync.py b/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueTracingSync.py deleted file mode 100644 index 046bb02b445c..000000000000 --- a/sdk/appconfiguration/azure-appconfiguration/tests/TestKeyValueTracingSync.py +++ /dev/null @@ -1,64 +0,0 @@ -import os -from azure.appconfiguration import AzureAppConfigurationClient, ConfigurationSetting -from opencensus.ext.azure.trace_exporter import AzureExporter -from opencensus.trace.tracer import Tracer -from opencensus.trace.samplers import AlwaysOnSampler - -def main(): - connection_string = os.environ['AZURE_APPCONFIG_CONNECTION_STRING'] - print(connection_string) - - exporter = AzureExporter( - instrumentation_key="4ab2a2c3-5590-4b5f-a075-77a994c1bc3c" - ) - - tracer = Tracer(exporter=exporter, sampler=AlwaysOnSampler()) - with tracer.span(name="azconfig") as span: - client = AzureAppConfigurationClient.from_connection_string(connection_string) - #keyvalue1 = client.get_key_value('tracing1') - #print(keyvalue1.value) - newkeyvalue = ConfigurationSetting() - newkeyvalue.key = "tracing1" - newkeyvalue.value = "aaa" - newkeyvalue.content_type = "testtype" - newkeyvalue.tags = { - "tag1": "value1", - "tag2": "value2", - } - #client.delete_configuration_setting('test2') - client.add_configuration_setting(newkeyvalue) - #client.add_configuration_setting(newkeyvalue) - keyvalue2 = client.get_configuration_setting('tracing1') - print(keyvalue2.value) - client.delete_configuration_setting('tracing1') - #newkeyvalue1 = ConfigurationSetting() - #newkeyvalue1.key="test2" - #newkeyvalue1.value="bbb" - #newkeyvalue1.label='' - #newkeyvalue1.content_type="testtype" - #newkeyvalue1.tags={ - # "tag1": "value1", - # "tag2": "value2", - # } - #temp = client.update_configuration_setting(key='test2', value="bbb") - #temp = client.add_key_value(newkeyvalue1) - #keyvalue3 = client.get_configuration_setting('test2') - #print(keyvalue3.value) - # client.key_values.delete('test2') - # client.key_values.delete('test3') - # keyvalue4 = client.key_values.get('test2') - # print(keyvalue4.value) - - #keyvalue5 = client.lock_configuration_setting("test2") - #print(keyvalue5.locked) - - #keyvalue6 = client.unlock_configuration_setting("test2") - #print(keyvalue6.locked) - - #keyvalues = list(client.list_revisions('test2')) - #currentkeyvalue = keyvalues[0] - - #print(currentkeyvalue) - -if __name__ == "__main__": - main() \ No newline at end of file From e3466ec896fad421a24331e0c81c4fa6afb7a8ac Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 6 Nov 2019 12:41:03 -0800 Subject: [PATCH 5/5] fix typo --- sdk/appconfiguration/azure-appconfiguration/HISTORY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/appconfiguration/azure-appconfiguration/HISTORY.md b/sdk/appconfiguration/azure-appconfiguration/HISTORY.md index 3ec34aba3312..f1e3fdcd3ced 100644 --- a/sdk/appconfiguration/azure-appconfiguration/HISTORY.md +++ b/sdk/appconfiguration/azure-appconfiguration/HISTORY.md @@ -7,7 +7,7 @@ ### Breaking changes -- Combine set_read_only & clear_read_only to be set_read_only(Ture/False) #8453 +- Combine set_read_only & clear_read_only to be set_read_only(True/False) #8453 ## 2019-10-30 Version 1.0.0b5