Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: skip crd capture when related api not deployed for support bundle #316

Merged
merged 11 commits into from
Aug 23, 2024
Merged

feat: skip crd capture when related api not deployed for support bundle #316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e63e576
update apis
Elsie4ever Aug 22, 2024
cf8d253
skip api
Elsie4ever Aug 22, 2024
6293041
remove func not used
Elsie4ever Aug 22, 2024
4f86b4d
Merge branch 'feature/0.7.0' into user/jiacju/unittest_update
Elsie4ever Aug 22, 2024
a14b653
fix linter
Elsie4ever Aug 22, 2024
90ac89a
Merge branch 'user/jiacju/unittest_update' of https://github.com/Elsi…
Elsie4ever Aug 22, 2024
ddb95ca
add warning when crd skipped
Elsie4ever Aug 23, 2024
e07ebe0
remove todos
Elsie4ever Aug 23, 2024
693be65
revert testing code
Elsie4ever Aug 23, 2024
b08fbb8
update test
Elsie4ever Aug 23, 2024
0514b91
address comment
Elsie4ever Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azext_edge/edge/providers/edge_api/mq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class MqResourceKinds(ListableEnum):


MQTT_BROKER_API_V1B1 = EdgeResourceApi(
group="mqttbroker.iotoperations.azure.com",
group="mqtt.iotoperations.azure.com",
version="v1beta1",
moniker="broker",
label="microsoft-iotoperations-mqttbroker",
Expand Down
2 changes: 1 addition & 1 deletion azext_edge/edge/providers/edge_api/opcua.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class OpcuaResourceKinds(ListableEnum):


OPCUA_API_V1 = EdgeResourceApi(
group="opcuabroker.iotoperations.azure.com",
group="opcuabroker2.iotoperations.azure.com",
version="v1beta1",
moniker="opcua",
label="microsoft-iotoperations-opcuabroker",
Expand Down
7 changes: 7 additions & 0 deletions azext_edge/edge/providers/support_bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ def build_bundle(
if ops_service in [OpsServiceType.auto.value, service_moniker]:
deployed_apis = api_info["apis"].get_deployed()

if not deployed_apis:
expected_api_version = api_info["apis"].as_str()
logger.warning(
Elsie4ever marked this conversation as resolved.
Show resolved Hide resolved
f"Skip capturing CRD for {service_moniker} since {expected_api_version} is not deployed, "
Elsie4ever marked this conversation as resolved.
Show resolved Hide resolved
"will try to get rest of the resources..."
)

# still try fetching other resources even crds are not available due to api version mismatch
bundle_method = api_info["prepare_bundle"]
# Check if the function takes a second argument
Expand Down
4 changes: 4 additions & 0 deletions azext_edge/tests/edge/support/test_support_unit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,10 @@ def test_create_bundle_crd_work(
support_bundle(None, ops_service=OpsServiceType.mq.value, bundle_dir=a_bundle_dir)

if mocked_cluster_resources["param"] == []:
mocked_root_logger.warning.assert_called_with(
"Skip capturing CRD for broker since mqtt.iotoperations.azure.com/[v1beta1] is not deployed, "
"will try to get rest of the resources..."
)
mocked_assemble_crd_work.assert_not_called()
else:
mocked_assemble_crd_work.assert_called_once()
Expand Down