Skip to content

Commit

Permalink
Fix additional locations selection
Browse files Browse the repository at this point in the history
  • Loading branch information
r4victor committed Aug 14, 2023
1 parent 1b9a0d9 commit 9f6339b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ def configure_backend(
selected=backend_config.storage_account
)
backend_values.extra_locations = self._get_extra_locations_element(
location=backend_config.location
location=backend_config.location,
selected_locations=backend_config.extra_locations or [],
)
return backend_values

Expand Down Expand Up @@ -313,13 +314,15 @@ def _get_storage_account_element(self, selected: Optional[str]) -> BackendElemen
element.selected = storage_accounts[0]
return element

def _get_extra_locations_element(self, location: str) -> BackendMultiElement:
def _get_extra_locations_element(
self, location: str, selected_locations: List[str]
) -> BackendMultiElement:
element = BackendMultiElement()
for l in LOCATION_VALUES:
if l == location:
continue
element.values.append(BackendElementValue(value=l, label=l))
element.selected.append(l)
element.selected = selected_locations
return element

def _get_resource_group(self) -> str:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ def configure_backend(
backend_values.extra_regions = self._get_hub_extra_regions_element(
region=backend_values.region.selected,
region_names=list(regions.keys()),
selected_regions=backend_config.extra_regions or [],
)
return backend_values

Expand Down Expand Up @@ -350,14 +351,17 @@ def _get_hub_vpc_subnet_element(
return element

def _get_hub_extra_regions_element(
self, region: str, region_names: List[str]
self,
region: str,
region_names: List[str],
selected_regions: List[str],
) -> BackendMultiElement:
element = BackendMultiElement()
for region_name in region_names:
if region_name == region:
continue
element.values.append(BackendElementValue(value=region_name, label=region_name))
element.selected.append(region_name)
element.selected = selected_regions
return element

def _auth(self, credentials_data: Dict):
Expand Down

0 comments on commit 9f6339b

Please sign in to comment.