Skip to content

feat: remove duplicated one of #29

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

Merged
merged 1 commit into from
Jan 25, 2023
Merged

feat: remove duplicated one of #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 7 additions & 19 deletions scaleway-async/scaleway_async/baremetal/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,25 +811,6 @@ def marshal_CreateServerRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"description": request.description,
"install": marshal_CreateServerRequestInstall(request.install, defaults)
if request.install is not None
else None,
"name": request.name,
"offer_id": request.offer_id,
"option_ids": request.option_ids,
**resolve_one_of(
[
OneOfPossibility(
"project_id", request.project_id, defaults.default_project_id
),
OneOfPossibility(
"organization_id",
request.organization_id,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility(
Expand All @@ -842,6 +823,13 @@ def marshal_CreateServerRequest(
),
]
),
"description": request.description,
"install": marshal_CreateServerRequestInstall(request.install, defaults)
if request.install is not None
else None,
"name": request.name,
"offer_id": request.offer_id,
"option_ids": request.option_ids,
"tags": request.tags,
}

Expand Down
76 changes: 0 additions & 76 deletions scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,16 +514,6 @@ def marshal_RuleSpecs(
]
),
"permission_set_names": request.permission_set_names,
**resolve_one_of(
[
OneOfPossibility("project_ids", request.project_ids),
OneOfPossibility(
"organization_id",
request.organization_id,
defaults.default_organization_id,
),
]
),
}


Expand All @@ -538,12 +528,6 @@ def marshal_AddGroupMemberRequest(
OneOfPossibility("application_id", request.application_id),
]
),
**resolve_one_of(
[
OneOfPossibility("user_id", request.user_id),
OneOfPossibility("application_id", request.application_id),
]
),
}


Expand All @@ -561,12 +545,6 @@ def marshal_CreateAPIKeyRequest(
"default_project_id": request.default_project_id,
"description": request.description,
"expires_at": request.expires_at,
**resolve_one_of(
[
OneOfPossibility("application_id", request.application_id),
OneOfPossibility("user_id", request.user_id),
]
),
}


Expand Down Expand Up @@ -606,35 +584,11 @@ def marshal_CreatePolicyRequest(
]
),
"description": request.description,
**resolve_one_of(
[
OneOfPossibility("user_id", request.user_id),
OneOfPossibility("group_id", request.group_id),
OneOfPossibility("application_id", request.application_id),
OneOfPossibility("no_principal", request.no_principal),
]
),
"name": request.name,
**resolve_one_of(
[
OneOfPossibility("user_id", request.user_id),
OneOfPossibility("group_id", request.group_id),
OneOfPossibility("application_id", request.application_id),
OneOfPossibility("no_principal", request.no_principal),
]
),
"organization_id": request.organization_id or defaults.default_organization_id,
"rules": [marshal_RuleSpecs(v, defaults) for v in request.rules]
if request.rules is not None
else None,
**resolve_one_of(
[
OneOfPossibility("user_id", request.user_id),
OneOfPossibility("group_id", request.group_id),
OneOfPossibility("application_id", request.application_id),
OneOfPossibility("no_principal", request.no_principal),
]
),
}


Expand All @@ -660,12 +614,6 @@ def marshal_RemoveGroupMemberRequest(
OneOfPossibility("application_id", request.application_id),
]
),
**resolve_one_of(
[
OneOfPossibility("user_id", request.user_id),
OneOfPossibility("application_id", request.application_id),
]
),
}


Expand Down Expand Up @@ -733,31 +681,7 @@ def marshal_UpdatePolicyRequest(
]
),
"description": request.description,
**resolve_one_of(
[
OneOfPossibility("user_id", request.user_id),
OneOfPossibility("group_id", request.group_id),
OneOfPossibility("application_id", request.application_id),
OneOfPossibility("no_principal", request.no_principal),
]
),
"name": request.name,
**resolve_one_of(
[
OneOfPossibility("user_id", request.user_id),
OneOfPossibility("group_id", request.group_id),
OneOfPossibility("application_id", request.application_id),
OneOfPossibility("no_principal", request.no_principal),
]
),
**resolve_one_of(
[
OneOfPossibility("user_id", request.user_id),
OneOfPossibility("group_id", request.group_id),
OneOfPossibility("application_id", request.application_id),
OneOfPossibility("no_principal", request.no_principal),
]
),
}


Expand Down
52 changes: 12 additions & 40 deletions scaleway-async/scaleway_async/iot/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,20 +822,20 @@ def marshal_CreateHubRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"disable_events": request.disable_events,
"events_topic_prefix": request.events_topic_prefix,
"name": request.name,
"product_plan": HubProductPlan(request.product_plan)
if request.product_plan is not None
else None,
"project_id": request.project_id or defaults.default_project_id,
**resolve_one_of(
[
OneOfPossibility(
"twins_graphite_config", request.twins_graphite_config
),
]
),
"disable_events": request.disable_events,
"events_topic_prefix": request.events_topic_prefix,
"name": request.name,
"product_plan": HubProductPlan(request.product_plan)
if request.product_plan is not None
else None,
"project_id": request.project_id or defaults.default_project_id,
}


Expand Down Expand Up @@ -867,20 +867,6 @@ def marshal_CreateRouteRequest(
),
"hub_id": request.hub_id,
"name": request.name,
**resolve_one_of(
[
OneOfPossibility("s3_config", request.s3_config),
OneOfPossibility("db_config", request.db_config),
OneOfPossibility("rest_config", request.rest_config),
]
),
**resolve_one_of(
[
OneOfPossibility("s3_config", request.s3_config),
OneOfPossibility("db_config", request.db_config),
OneOfPossibility("rest_config", request.rest_config),
]
),
"topic": request.topic,
}

Expand Down Expand Up @@ -946,18 +932,18 @@ def marshal_UpdateHubRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"disable_events": request.disable_events,
"enable_device_auto_provisioning": request.enable_device_auto_provisioning,
"events_topic_prefix": request.events_topic_prefix,
"name": request.name,
"product_plan": HubProductPlan(request.product_plan),
**resolve_one_of(
[
OneOfPossibility(
"twins_graphite_config", request.twins_graphite_config
),
]
),
"disable_events": request.disable_events,
"enable_device_auto_provisioning": request.enable_device_auto_provisioning,
"events_topic_prefix": request.events_topic_prefix,
"name": request.name,
"product_plan": HubProductPlan(request.product_plan),
}


Expand All @@ -974,19 +960,5 @@ def marshal_UpdateRouteRequest(
]
),
"name": request.name,
**resolve_one_of(
[
OneOfPossibility("s3_config", request.s3_config),
OneOfPossibility("db_config", request.db_config),
OneOfPossibility("rest_config", request.rest_config),
]
),
**resolve_one_of(
[
OneOfPossibility("s3_config", request.s3_config),
OneOfPossibility("db_config", request.db_config),
OneOfPossibility("rest_config", request.rest_config),
]
),
"topic": request.topic,
}
6 changes: 3 additions & 3 deletions scaleway-async/scaleway_async/mnq/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,13 @@ def marshal_CreateCredentialRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"name": request.name,
"namespace_id": request.namespace_id,
**resolve_one_of(
[
OneOfPossibility("permissions", request.permissions),
]
),
"name": request.name,
"namespace_id": request.namespace_id,
}


Expand All @@ -272,12 +272,12 @@ def marshal_UpdateCredentialRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"name": request.name,
**resolve_one_of(
[
OneOfPossibility("permissions", request.permissions),
]
),
"name": request.name,
}


Expand Down
Loading