From cea9d45fdfe3c89c7aecf39aea1afe0194a3c4f9 Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Mon, 26 Apr 2021 13:19:06 -0400 Subject: [PATCH 1/3] updating the delete methods --- tools/azure-sdk-tools/devtools_testutils/resource_testcase.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py b/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py index 5ff7ff56a62c..0ed139d55e0e 100644 --- a/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py +++ b/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py @@ -101,6 +101,9 @@ def create_resource(self, name, **kwargs): def remove_resource(self, name, **kwargs): if self.is_live and self._need_creation: + name = u"rgpy-" + name + if len(name) > 90: + name = name[:90] try: if "wait_timeout" in kwargs: azure_poller = self.client.resource_groups.begin_delete(name) From 6a857a311033fd5c4dfc68c9e2a71ef55cffff10 Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Tue, 27 Apr 2021 09:57:34 -0400 Subject: [PATCH 2/3] moving logging statement --- .../azure-sdk-tools/devtools_testutils/resource_testcase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py b/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py index 0ed139d55e0e..3f1feb615e6e 100644 --- a/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py +++ b/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py @@ -75,13 +75,13 @@ def create_resource(self, name, **kwargs): parameters["tags"]["BuildNumber"] = os.environ.get("BUILD_BUILDNUMBER", "local") parameters["tags"]["BuildReason"] = os.environ.get("BUILD_REASON", "local") try: - logging.info( - "Attempting to create a Resource Group with name {} and parameters {}".format(name, parameters) - ) # Prefixing all RGs created here with 'rgpy-' for tracing purposes name = u"rgpy-" + name if len(name) > 90: name = name[:90] + logging.info( + "Attempting to create a Resource Group with name {} and parameters {}".format(name, parameters) + ) self.resource = self.client.resource_groups.create_or_update(name, parameters) except Exception as ex: if "ReservedResourceName" in str(ex): From b295db272819daf41f8b393d9c89752d5b56524f Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Tue, 6 Jul 2021 12:31:38 -0400 Subject: [PATCH 3/3] breaking out into method --- .../devtools_testutils/resource_testcase.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py b/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py index 3f1feb615e6e..344b10090ea5 100644 --- a/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py +++ b/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py @@ -63,6 +63,12 @@ def __init__( self.set_cache(use_cache, parameter_name, name_prefix) self.delete_after_tag_timedelta = delete_after_tag_timedelta + def _prefix_name(self, name): + name = u"rgpy-" + name + if len(name) > 90: + name = name[:90] + return name + def create_resource(self, name, **kwargs): if self.is_live and self._need_creation: self.client = self.create_mgmt_client(ResourceManagementClient) @@ -76,9 +82,7 @@ def create_resource(self, name, **kwargs): parameters["tags"]["BuildReason"] = os.environ.get("BUILD_REASON", "local") try: # Prefixing all RGs created here with 'rgpy-' for tracing purposes - name = u"rgpy-" + name - if len(name) > 90: - name = name[:90] + name = self._prefix_name(name) logging.info( "Attempting to create a Resource Group with name {} and parameters {}".format(name, parameters) ) @@ -101,9 +105,7 @@ def create_resource(self, name, **kwargs): def remove_resource(self, name, **kwargs): if self.is_live and self._need_creation: - name = u"rgpy-" + name - if len(name) > 90: - name = name[:90] + name = self._prefix_name(name) try: if "wait_timeout" in kwargs: azure_poller = self.client.resource_groups.begin_delete(name)