unitysvc-core 0.3.0__tar.gz → 0.3.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {unitysvc_core-0.3.0/src/unitysvc_core.egg-info → unitysvc_core-0.3.2}/PKG-INFO +11 -2
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/README.md +10 -1
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/pyproject.toml +1 -1
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/grants.py +71 -3
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/parameter_usage.py +21 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2/src/unitysvc_core.egg-info}/PKG-INFO +11 -2
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_grants.py +100 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_parameter_usage.py +84 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/LICENSE +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/setup.cfg +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/__init__.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/__init__.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/base.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/channel.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/documents.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/listing_data.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/listing_v1.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/offering_data.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/offering_v1.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/pricing.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/promotion_data.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/provider_data.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/provider_v1.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/service.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/service_group_data.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/models/validators.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/py.typed +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/schema/base.json +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/schema/listing_v1.json +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/schema/offering_v1.json +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/schema/promotion_v1.json +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/schema/provider_v1.json +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/schema/service_group_v1.json +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/utils.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core/validator.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core.egg-info/SOURCES.txt +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core.egg-info/dependency_links.txt +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core.egg-info/requires.txt +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/src/unitysvc_core.egg-info/top_level.txt +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_access_interface_routing.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_canonical_interfaces.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_channel.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_effective_price.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_hidden_path_skip.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_listing_audience.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_offering_data.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_pricing.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_provider_account_rate_limits.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_service_group.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_service_status.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_utils.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_validate_service.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_validator.py +0 -0
- {unitysvc_core-0.3.0 → unitysvc_core-0.3.2}/tests/test_validators.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: unitysvc-core
|
|
3
|
-
Version: 0.3.
|
|
3
|
+
Version: 0.3.2
|
|
4
4
|
Summary: Shared data models and validation helpers for UnitySVC packages
|
|
5
5
|
Author-email: Bo Peng <bo.peng@unitysvc.com>
|
|
6
6
|
Maintainer-email: Bo Peng <bo.peng@unitysvc.com>
|
|
@@ -208,7 +208,7 @@ Three stages (unitysvc/unitysvc#2720): a target service's **`exports`** (what it
|
|
|
208
208
|
"limits": {"count_per_day": 1000}}]
|
|
209
209
|
```
|
|
210
210
|
|
|
211
|
-
- `object` names one service (`service:<name>`, no wildcards), or `apikey` for the leased key's lifespan (below).
|
|
211
|
+
- `object` names one service (`service:<name>`, no wildcards), or `apikey` for the leased key's lifespan (below).
|
|
212
212
|
- `options` is written in query-string syntax (`parse_options`; a notation, not how options are delivered): each name once, each value non-empty; with a catalog, each value is converted to its declared type and validated against the target's `options` schema.
|
|
213
213
|
- **Enrollment is where options and limits are set.** In a request, `options` and `limits` only pre-fill the enrollment form for convenience. When enrolling, the customer confirms and sets the options (a form rendered from the target's `options` schema) and the limits, and adds their own limits; the result is the issued key's policy.
|
|
214
214
|
- `limits` (`validate_limits`): `count_per_hour` / `count_per_day` / `count_per_month` / `count_total` (positive integer) and the same for `amount_` (finite positive decimal, as a number or a string). Limits are universal: the platform meters every call, so any service can be limited without exporting anything. The seller's limits are a pre-fill; the customer sets them at enrollment, and an enrollment's own limits (unitysvc/unitysvc#2687) use the same shape. They are counted per policy entry (the enrollment's calls to that service) from the usage stream (counters keyed by scope, metric and window bucket), and the gateway refuses calls once one is exceeded.
|
|
@@ -241,6 +241,14 @@ Three stages (unitysvc/unitysvc#2720): a target service's **`exports`** (what it
|
|
|
241
241
|
- The `apikey` lifespan may be shortened, never lengthened beyond the request.
|
|
242
242
|
- The result drops `required` / `justification` and empty `options` / `limits`. `api_key_lifespan(policy)` reads the lifespan back (the default when there is none).
|
|
243
243
|
|
|
244
|
+
A policy has three kinds of entry (unitysvc/unitysvc#2770):
|
|
245
|
+
|
|
246
|
+
| Entry | Means |
|
|
247
|
+
| --- | --- |
|
|
248
|
+
| `{"object": "enrollment", "limits": {"amount_per_day": "1.00"}}` | This enrollment's own limits (total spending, say). The customer adds it without a request; it takes only `limits`, at least one, at most one entry. It grants nothing. |
|
|
249
|
+
| `{"object": "service:ai", ...}` | A service the app calls for the customer. A seller may name a specific one (`service:labs/llm-premium` instead of `service:ai` with `options="service=labs/llm-premium"`), at the cost of the customer's choice of provider, which a customer may decline. |
|
|
250
|
+
| `{"object": "service:<name>", "enrollment": "<CODE>", ...}` | One of the customer's enrollments of a service that requires enrolling (a chain enrollment), called through `/e/<CODE>`. The customer picks the enrollment when approving the request for `service:<name>`, so a request never carries a code. A canonical code, no `options` (the enrollment's params are fixed), permissions and limits as for any service entry. Core checks the code's form; the caller checks the enrollment is the customer's. |
|
|
251
|
+
|
|
244
252
|
### Upstream access channels
|
|
245
253
|
|
|
246
254
|
`upstream_access_config` maps a channel name to a channel (`UpstreamAccessConfig`, `ChannelConfig`; unitysvc/unitysvc#2730). A channel describes one way the platform reaches the upstream, as a whole, and its `servers` hold the connection, typed by the channel's protocol:
|
|
@@ -280,5 +288,6 @@ A channel declares the enrollment parameters it reads, so each plan of a service
|
|
|
280
288
|
`params.schema` is a JSON Schema of the parameters (a property's own `default` pre-fills the customer's form), `params.ui_schema` holds form hints, and `params.testing_defaults` holds the values the platform tests the channel with. Rules:
|
|
281
289
|
|
|
282
290
|
- a channel reads only the parameters its `params.schema` declares, and a channel that reads `{{ params.* }}` must declare `params` (`validate_channel_parameters`, on every `offering_v1`);
|
|
291
|
+
- `params.schema` is a valid, self-contained JSON Schema (draft 7, no `$ref`), and `params.testing_defaults` validates against it with format checking (an `email` property needs an email address), so a malformed schema is refused at ingest rather than when a customer enrolls;
|
|
283
292
|
- each required parameter has a value in that channel's `params.testing_defaults`, which is also what `${ customer_secrets.{{ params.X }} }` renders with when secret references are checked;
|
|
284
293
|
- each required parameter is read by its own channel or by document content (`validate_required_parameter_usage`, which backend ingest also calls).
|
|
@@ -173,7 +173,7 @@ Three stages (unitysvc/unitysvc#2720): a target service's **`exports`** (what it
|
|
|
173
173
|
"limits": {"count_per_day": 1000}}]
|
|
174
174
|
```
|
|
175
175
|
|
|
176
|
-
- `object` names one service (`service:<name>`, no wildcards), or `apikey` for the leased key's lifespan (below).
|
|
176
|
+
- `object` names one service (`service:<name>`, no wildcards), or `apikey` for the leased key's lifespan (below).
|
|
177
177
|
- `options` is written in query-string syntax (`parse_options`; a notation, not how options are delivered): each name once, each value non-empty; with a catalog, each value is converted to its declared type and validated against the target's `options` schema.
|
|
178
178
|
- **Enrollment is where options and limits are set.** In a request, `options` and `limits` only pre-fill the enrollment form for convenience. When enrolling, the customer confirms and sets the options (a form rendered from the target's `options` schema) and the limits, and adds their own limits; the result is the issued key's policy.
|
|
179
179
|
- `limits` (`validate_limits`): `count_per_hour` / `count_per_day` / `count_per_month` / `count_total` (positive integer) and the same for `amount_` (finite positive decimal, as a number or a string). Limits are universal: the platform meters every call, so any service can be limited without exporting anything. The seller's limits are a pre-fill; the customer sets them at enrollment, and an enrollment's own limits (unitysvc/unitysvc#2687) use the same shape. They are counted per policy entry (the enrollment's calls to that service) from the usage stream (counters keyed by scope, metric and window bucket), and the gateway refuses calls once one is exceeded.
|
|
@@ -206,6 +206,14 @@ Three stages (unitysvc/unitysvc#2720): a target service's **`exports`** (what it
|
|
|
206
206
|
- The `apikey` lifespan may be shortened, never lengthened beyond the request.
|
|
207
207
|
- The result drops `required` / `justification` and empty `options` / `limits`. `api_key_lifespan(policy)` reads the lifespan back (the default when there is none).
|
|
208
208
|
|
|
209
|
+
A policy has three kinds of entry (unitysvc/unitysvc#2770):
|
|
210
|
+
|
|
211
|
+
| Entry | Means |
|
|
212
|
+
| --- | --- |
|
|
213
|
+
| `{"object": "enrollment", "limits": {"amount_per_day": "1.00"}}` | This enrollment's own limits (total spending, say). The customer adds it without a request; it takes only `limits`, at least one, at most one entry. It grants nothing. |
|
|
214
|
+
| `{"object": "service:ai", ...}` | A service the app calls for the customer. A seller may name a specific one (`service:labs/llm-premium` instead of `service:ai` with `options="service=labs/llm-premium"`), at the cost of the customer's choice of provider, which a customer may decline. |
|
|
215
|
+
| `{"object": "service:<name>", "enrollment": "<CODE>", ...}` | One of the customer's enrollments of a service that requires enrolling (a chain enrollment), called through `/e/<CODE>`. The customer picks the enrollment when approving the request for `service:<name>`, so a request never carries a code. A canonical code, no `options` (the enrollment's params are fixed), permissions and limits as for any service entry. Core checks the code's form; the caller checks the enrollment is the customer's. |
|
|
216
|
+
|
|
209
217
|
### Upstream access channels
|
|
210
218
|
|
|
211
219
|
`upstream_access_config` maps a channel name to a channel (`UpstreamAccessConfig`, `ChannelConfig`; unitysvc/unitysvc#2730). A channel describes one way the platform reaches the upstream, as a whole, and its `servers` hold the connection, typed by the channel's protocol:
|
|
@@ -245,5 +253,6 @@ A channel declares the enrollment parameters it reads, so each plan of a service
|
|
|
245
253
|
`params.schema` is a JSON Schema of the parameters (a property's own `default` pre-fills the customer's form), `params.ui_schema` holds form hints, and `params.testing_defaults` holds the values the platform tests the channel with. Rules:
|
|
246
254
|
|
|
247
255
|
- a channel reads only the parameters its `params.schema` declares, and a channel that reads `{{ params.* }}` must declare `params` (`validate_channel_parameters`, on every `offering_v1`);
|
|
256
|
+
- `params.schema` is a valid, self-contained JSON Schema (draft 7, no `$ref`), and `params.testing_defaults` validates against it with format checking (an `email` property needs an email address), so a malformed schema is refused at ingest rather than when a customer enrolls;
|
|
248
257
|
- each required parameter has a value in that channel's `params.testing_defaults`, which is also what `${ customer_secrets.{{ params.X }} }` renders with when secret references are checked;
|
|
249
258
|
- each required parameter is read by its own channel or by document content (`validate_required_parameter_usage`, which backend ingest also calls).
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "unitysvc-core"
|
|
7
|
-
version = "0.3.
|
|
7
|
+
version = "0.3.2"
|
|
8
8
|
description = "Shared data models and validation helpers for UnitySVC packages"
|
|
9
9
|
readme = "README.md"
|
|
10
10
|
authors = [{ name = "Bo Peng", email = "bo.peng@unitysvc.com" }]
|
|
@@ -74,10 +74,26 @@ customer consent and key issuance establish its *authority*.
|
|
|
74
74
|
|
|
75
75
|
Today a request's ``object`` is ``service:<name>``, or ``apikey``: how long a
|
|
76
76
|
key leased for the enrollment lives (``limits.api_key_lifespan``, up to a day,
|
|
77
|
-
with a justification), which grants nothing.
|
|
78
|
-
enrollment of an enrollable service) may follow. :func:`build_policy` turns a
|
|
77
|
+
with a justification), which grants nothing. :func:`build_policy` turns a
|
|
79
78
|
customer's approvals into the policy an enrollment keeps.
|
|
80
79
|
|
|
80
|
+
A policy has three kinds of entry (unitysvc/unitysvc#2770):
|
|
81
|
+
|
|
82
|
+
* ``{"object": "enrollment", "limits": {...}}``: this enrollment's own limits
|
|
83
|
+
(what it may cost in total, say). The customer's own; no seller requests it,
|
|
84
|
+
and it grants nothing.
|
|
85
|
+
* ``{"object": "service:<name>", ...}``: a service the enrolled app calls for
|
|
86
|
+
the customer, usually a common one (``service:ai``, ``service:notify``). A
|
|
87
|
+
seller may name a specific service (``service:labs/llm-premium`` rather than
|
|
88
|
+
``service:ai`` with ``options="service=labs/llm-premium"``), at the cost of
|
|
89
|
+
the customer's choice of provider, which a customer may decline.
|
|
90
|
+
* ``{"object": "service:<name>", "enrollment": "<CODE>", ...}``: one of the
|
|
91
|
+
customer's enrollments of a service that requires enrolling (a chain
|
|
92
|
+
enrollment), which the app calls through ``/e/<CODE>``. Its params are fixed
|
|
93
|
+
by that enrollment, so it takes no ``options``. Which enrollment is the
|
|
94
|
+
customer's choice when approving, so a request never names one; core checks
|
|
95
|
+
the code's form, the caller that the enrollment is the customer's.
|
|
96
|
+
|
|
81
97
|
There is no central list of services. Core does no I/O: every request's
|
|
82
98
|
permissions and options are checked against its target's ``exports`` when the
|
|
83
99
|
caller passes an :data:`ExportsResolver` that looks the target up in the
|
|
@@ -107,6 +123,10 @@ INVOKE = "invoke"
|
|
|
107
123
|
# The key itself: a request for a longer-lived leased key, and the approved
|
|
108
124
|
# lifespan in a policy. It grants nothing.
|
|
109
125
|
APIKEY_OBJECT = "apikey"
|
|
126
|
+
# Every service at once. It belongs to keys a customer creates by hand: a
|
|
127
|
+
# policy derived from an enrollment names each service it calls
|
|
128
|
+
# (unitysvc/unitysvc#2783), so no request or approval may hold it.
|
|
129
|
+
SERVICE_WILDCARD = "service:*"
|
|
110
130
|
API_KEY_LIFESPAN = "api_key_lifespan"
|
|
111
131
|
# Seconds a leased key lives unless the policy says otherwise, and at most.
|
|
112
132
|
DEFAULT_API_KEY_LIFESPAN = 3600
|
|
@@ -157,6 +177,12 @@ _REQUEST_KEYS = frozenset({"object", "permissions", "required", "justification",
|
|
|
157
177
|
_APIKEY_REQUEST_KEYS = frozenset({"object", "justification", "limits"})
|
|
158
178
|
# What a policy entry (an approved request) holds.
|
|
159
179
|
_POLICY_KEYS = frozenset({"object", "permissions", "options", "limits"})
|
|
180
|
+
# This enrollment itself: an entry capping what it may cost. It grants nothing.
|
|
181
|
+
ENROLLMENT_OBJECT = "enrollment"
|
|
182
|
+
# On a service entry, one enrollment of that service (a chain enrollment).
|
|
183
|
+
ENROLLMENT_KEY = "enrollment"
|
|
184
|
+
# An enrollment code: canonical Crockford base32 (no I, L, O, U).
|
|
185
|
+
_ENROLLMENT_CODE = re.compile(r"^[0-9A-HJKMNP-TV-Z]+$")
|
|
160
186
|
|
|
161
187
|
|
|
162
188
|
def _strings(value: Any) -> bool:
|
|
@@ -384,6 +410,8 @@ def validate_access_requests(where: str, requests: Any, resolve: ExportsResolver
|
|
|
384
410
|
seen.add(obj)
|
|
385
411
|
_check_apikey_request(at, entry)
|
|
386
412
|
continue
|
|
413
|
+
if obj == SERVICE_WILDCARD:
|
|
414
|
+
raise ValueError(_service_wildcard_refusal(at, "requested"))
|
|
387
415
|
if not obj.startswith(SERVICE_PREFIX):
|
|
388
416
|
raise ValueError(f"{at}: {obj!r} cannot be requested; name one service as 'service:<name>'")
|
|
389
417
|
name = obj.removeprefix(SERVICE_PREFIX)
|
|
@@ -416,6 +444,13 @@ def validate_access_requests(where: str, requests: Any, resolve: ExportsResolver
|
|
|
416
444
|
check_claim(at, obj, permissions, options, parse_exports(f"{obj} exports", declared))
|
|
417
445
|
|
|
418
446
|
|
|
447
|
+
def _service_wildcard_refusal(at: str, verb: str) -> str:
|
|
448
|
+
return (
|
|
449
|
+
f"{at}: {SERVICE_WILDCARD!r} cannot be {verb}: every service at once is only for keys "
|
|
450
|
+
"a customer creates by hand; name each service as 'service:<name>'"
|
|
451
|
+
)
|
|
452
|
+
|
|
453
|
+
|
|
419
454
|
def _check_apikey_request(at: str, entry: dict[str, Any]) -> None:
|
|
420
455
|
"""The ``apikey`` request: how long a leased key should live, with why."""
|
|
421
456
|
if extra := set(entry) - _APIKEY_REQUEST_KEYS:
|
|
@@ -469,6 +504,13 @@ def build_policy(requests: Any, approvals: Any, resolve: ExportsResolver | None
|
|
|
469
504
|
:func:`validate_limits`, not against the request. A key lifespan may only
|
|
470
505
|
be shortened. Returns the approvals as policy entries, without empty
|
|
471
506
|
``options`` / ``limits``. Raises ``ValueError``.
|
|
507
|
+
|
|
508
|
+
The customer may also add, at most once and without a request, this
|
|
509
|
+
enrollment's own limits: ``{"object": "enrollment", "limits": {...}}``,
|
|
510
|
+
with at least one limit and nothing else (unitysvc/unitysvc#2770). And an
|
|
511
|
+
approval of a service may select one of the customer's enrollments of it
|
|
512
|
+
(``"enrollment": "<CODE>"``, a chain enrollment): a canonical code, and no
|
|
513
|
+
``options``. The caller checks the enrollment is the customer's.
|
|
472
514
|
"""
|
|
473
515
|
validate_access_requests("requests", requests)
|
|
474
516
|
requested = {entry["object"]: entry for entry in requests}
|
|
@@ -480,6 +522,13 @@ def build_policy(requests: Any, approvals: Any, resolve: ExportsResolver | None
|
|
|
480
522
|
if not isinstance(approval, dict) or not isinstance(approval.get("object"), str):
|
|
481
523
|
raise ValueError(f'{at} must be {{"object": ..., "permissions": [...]}}')
|
|
482
524
|
obj = approval["object"]
|
|
525
|
+
if obj == SERVICE_WILDCARD:
|
|
526
|
+
raise ValueError(_service_wildcard_refusal(at, "approved"))
|
|
527
|
+
if obj == ENROLLMENT_OBJECT:
|
|
528
|
+
if any(entry["object"] == obj for entry in policy):
|
|
529
|
+
raise ValueError(f"{at}: {obj} is listed twice")
|
|
530
|
+
policy.append(_enrollment_entry(at, approval))
|
|
531
|
+
continue
|
|
483
532
|
request = requested.get(obj)
|
|
484
533
|
if request is None:
|
|
485
534
|
raise ValueError(f"{at}: {obj} is not requested")
|
|
@@ -494,8 +543,14 @@ def build_policy(requests: Any, approvals: Any, resolve: ExportsResolver | None
|
|
|
494
543
|
raise ValueError(f"{at}.limits.{API_KEY_LIFESPAN}: the service asks for at most {asked} seconds")
|
|
495
544
|
policy.append({"object": obj, "limits": dict(approval["limits"])})
|
|
496
545
|
continue
|
|
497
|
-
if extra := set(approval) - _POLICY_KEYS:
|
|
546
|
+
if extra := set(approval) - _POLICY_KEYS - {ENROLLMENT_KEY}:
|
|
498
547
|
raise ValueError(f"{at}: unknown keys {sorted(extra)}")
|
|
548
|
+
code = approval.get(ENROLLMENT_KEY)
|
|
549
|
+
if ENROLLMENT_KEY in approval:
|
|
550
|
+
if not isinstance(code, str) or not _ENROLLMENT_CODE.match(code):
|
|
551
|
+
raise ValueError(f"{at}.{ENROLLMENT_KEY} must be an enrollment code, like JYY87Y")
|
|
552
|
+
if approval.get("options"):
|
|
553
|
+
raise ValueError(f"{at}.options: an enrollment's params are fixed; it takes no options")
|
|
499
554
|
permissions: list[str] = approval.get("permissions") or []
|
|
500
555
|
if not _strings(permissions):
|
|
501
556
|
raise ValueError(f"{at}.permissions must be a non-empty list of distinct names")
|
|
@@ -511,6 +566,8 @@ def build_policy(requests: Any, approvals: Any, resolve: ExportsResolver | None
|
|
|
511
566
|
raise ValueError(f"{at}: {obj} is not a published service")
|
|
512
567
|
check_claim(at, obj, permissions, options, parse_exports(f"{obj} exports", declared))
|
|
513
568
|
entry: dict[str, Any] = {"object": obj, "permissions": list(permissions)}
|
|
569
|
+
if code is not None:
|
|
570
|
+
entry[ENROLLMENT_KEY] = code
|
|
514
571
|
if options:
|
|
515
572
|
entry["options"] = options_text
|
|
516
573
|
if limits:
|
|
@@ -522,6 +579,17 @@ def build_policy(requests: Any, approvals: Any, resolve: ExportsResolver | None
|
|
|
522
579
|
return policy
|
|
523
580
|
|
|
524
581
|
|
|
582
|
+
def _enrollment_entry(at: str, approval: dict[str, Any]) -> dict[str, Any]:
|
|
583
|
+
"""This enrollment's own entry: limits only, and at least one."""
|
|
584
|
+
if extra := set(approval) - {"object", "limits"}:
|
|
585
|
+
raise ValueError(f"{at}: unknown keys {sorted(extra)} (the {ENROLLMENT_OBJECT} entry takes only limits)")
|
|
586
|
+
limits = approval.get("limits")
|
|
587
|
+
if not limits:
|
|
588
|
+
raise ValueError(f"{at}.limits: the {ENROLLMENT_OBJECT} entry must set at least one limit")
|
|
589
|
+
validate_limits(f"{at}.limits", limits)
|
|
590
|
+
return {"object": ENROLLMENT_OBJECT, "limits": dict(limits)}
|
|
591
|
+
|
|
592
|
+
|
|
525
593
|
def api_key_lifespan(policy: Any) -> int:
|
|
526
594
|
"""Seconds a key leased with ``policy`` lives: its ``apikey`` entry's
|
|
527
595
|
``api_key_lifespan``, else :data:`DEFAULT_API_KEY_LIFESPAN`. A malformed
|
|
@@ -5,6 +5,8 @@ declares none. Checks shared by seller validation and backend ingest:
|
|
|
5
5
|
|
|
6
6
|
- a channel reads only parameters it declares, and declares ``params`` if it
|
|
7
7
|
reads any;
|
|
8
|
+
- ``params.schema`` is a self-contained JSON Schema (draft 7), and
|
|
9
|
+
``params.testing_defaults`` validates against it;
|
|
8
10
|
- every required parameter has a value in ``params.testing_defaults``;
|
|
9
11
|
- every required parameter is read by its channel or by document content.
|
|
10
12
|
|
|
@@ -17,6 +19,10 @@ reference there does not count (unitysvc/unitysvc#2649).
|
|
|
17
19
|
from typing import Any
|
|
18
20
|
|
|
19
21
|
from jinja2 import Environment, TemplateSyntaxError, nodes
|
|
22
|
+
from jsonschema import Draft7Validator
|
|
23
|
+
from jsonschema.exceptions import SchemaError
|
|
24
|
+
|
|
25
|
+
from .grants import _find_reference
|
|
20
26
|
|
|
21
27
|
_ENV = Environment()
|
|
22
28
|
|
|
@@ -156,6 +162,16 @@ def validate_channel_parameters(offering: dict[str, Any]) -> list[str]:
|
|
|
156
162
|
if not isinstance(schema, dict):
|
|
157
163
|
errors.append(f"{at}.schema must be a JSON Schema object")
|
|
158
164
|
continue
|
|
165
|
+
schema_ok = True
|
|
166
|
+
if ref := _find_reference(schema):
|
|
167
|
+
errors.append(f"{at}.schema: {ref!r} is not allowed; a params schema is self-contained")
|
|
168
|
+
schema_ok = False
|
|
169
|
+
else:
|
|
170
|
+
try:
|
|
171
|
+
Draft7Validator.check_schema(schema)
|
|
172
|
+
except SchemaError as exc:
|
|
173
|
+
errors.append(f"{at}.schema is not a valid JSON Schema: {exc.message}")
|
|
174
|
+
schema_ok = False
|
|
159
175
|
ui_schema = params.get("ui_schema")
|
|
160
176
|
if ui_schema is not None and not isinstance(ui_schema, dict):
|
|
161
177
|
errors.append(f"{at}.ui_schema must be an object")
|
|
@@ -173,6 +189,11 @@ def validate_channel_parameters(offering: dict[str, Any]) -> list[str]:
|
|
|
173
189
|
f"{where}: required parameter(s) {', '.join(missing)} need a value in "
|
|
174
190
|
f"{at}.testing_defaults, used to test the channel"
|
|
175
191
|
)
|
|
192
|
+
elif schema_ok:
|
|
193
|
+
validator = Draft7Validator(schema, format_checker=Draft7Validator.FORMAT_CHECKER)
|
|
194
|
+
for error in sorted(validator.iter_errors(defaults or {}), key=lambda e: [str(p) for p in e.path]):
|
|
195
|
+
path = "".join(f".{p}" for p in error.path)
|
|
196
|
+
errors.append(f"{at}.testing_defaults{path}: {error.message}")
|
|
176
197
|
return errors
|
|
177
198
|
|
|
178
199
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: unitysvc-core
|
|
3
|
-
Version: 0.3.
|
|
3
|
+
Version: 0.3.2
|
|
4
4
|
Summary: Shared data models and validation helpers for UnitySVC packages
|
|
5
5
|
Author-email: Bo Peng <bo.peng@unitysvc.com>
|
|
6
6
|
Maintainer-email: Bo Peng <bo.peng@unitysvc.com>
|
|
@@ -208,7 +208,7 @@ Three stages (unitysvc/unitysvc#2720): a target service's **`exports`** (what it
|
|
|
208
208
|
"limits": {"count_per_day": 1000}}]
|
|
209
209
|
```
|
|
210
210
|
|
|
211
|
-
- `object` names one service (`service:<name>`, no wildcards), or `apikey` for the leased key's lifespan (below).
|
|
211
|
+
- `object` names one service (`service:<name>`, no wildcards), or `apikey` for the leased key's lifespan (below).
|
|
212
212
|
- `options` is written in query-string syntax (`parse_options`; a notation, not how options are delivered): each name once, each value non-empty; with a catalog, each value is converted to its declared type and validated against the target's `options` schema.
|
|
213
213
|
- **Enrollment is where options and limits are set.** In a request, `options` and `limits` only pre-fill the enrollment form for convenience. When enrolling, the customer confirms and sets the options (a form rendered from the target's `options` schema) and the limits, and adds their own limits; the result is the issued key's policy.
|
|
214
214
|
- `limits` (`validate_limits`): `count_per_hour` / `count_per_day` / `count_per_month` / `count_total` (positive integer) and the same for `amount_` (finite positive decimal, as a number or a string). Limits are universal: the platform meters every call, so any service can be limited without exporting anything. The seller's limits are a pre-fill; the customer sets them at enrollment, and an enrollment's own limits (unitysvc/unitysvc#2687) use the same shape. They are counted per policy entry (the enrollment's calls to that service) from the usage stream (counters keyed by scope, metric and window bucket), and the gateway refuses calls once one is exceeded.
|
|
@@ -241,6 +241,14 @@ Three stages (unitysvc/unitysvc#2720): a target service's **`exports`** (what it
|
|
|
241
241
|
- The `apikey` lifespan may be shortened, never lengthened beyond the request.
|
|
242
242
|
- The result drops `required` / `justification` and empty `options` / `limits`. `api_key_lifespan(policy)` reads the lifespan back (the default when there is none).
|
|
243
243
|
|
|
244
|
+
A policy has three kinds of entry (unitysvc/unitysvc#2770):
|
|
245
|
+
|
|
246
|
+
| Entry | Means |
|
|
247
|
+
| --- | --- |
|
|
248
|
+
| `{"object": "enrollment", "limits": {"amount_per_day": "1.00"}}` | This enrollment's own limits (total spending, say). The customer adds it without a request; it takes only `limits`, at least one, at most one entry. It grants nothing. |
|
|
249
|
+
| `{"object": "service:ai", ...}` | A service the app calls for the customer. A seller may name a specific one (`service:labs/llm-premium` instead of `service:ai` with `options="service=labs/llm-premium"`), at the cost of the customer's choice of provider, which a customer may decline. |
|
|
250
|
+
| `{"object": "service:<name>", "enrollment": "<CODE>", ...}` | One of the customer's enrollments of a service that requires enrolling (a chain enrollment), called through `/e/<CODE>`. The customer picks the enrollment when approving the request for `service:<name>`, so a request never carries a code. A canonical code, no `options` (the enrollment's params are fixed), permissions and limits as for any service entry. Core checks the code's form; the caller checks the enrollment is the customer's. |
|
|
251
|
+
|
|
244
252
|
### Upstream access channels
|
|
245
253
|
|
|
246
254
|
`upstream_access_config` maps a channel name to a channel (`UpstreamAccessConfig`, `ChannelConfig`; unitysvc/unitysvc#2730). A channel describes one way the platform reaches the upstream, as a whole, and its `servers` hold the connection, typed by the channel's protocol:
|
|
@@ -280,5 +288,6 @@ A channel declares the enrollment parameters it reads, so each plan of a service
|
|
|
280
288
|
`params.schema` is a JSON Schema of the parameters (a property's own `default` pre-fills the customer's form), `params.ui_schema` holds form hints, and `params.testing_defaults` holds the values the platform tests the channel with. Rules:
|
|
281
289
|
|
|
282
290
|
- a channel reads only the parameters its `params.schema` declares, and a channel that reads `{{ params.* }}` must declare `params` (`validate_channel_parameters`, on every `offering_v1`);
|
|
291
|
+
- `params.schema` is a valid, self-contained JSON Schema (draft 7, no `$ref`), and `params.testing_defaults` validates against it with format checking (an `email` property needs an email address), so a malformed schema is refused at ingest rather than when a customer enrolls;
|
|
283
292
|
- each required parameter has a value in that channel's `params.testing_defaults`, which is also what `${ customer_secrets.{{ params.X }} }` renders with when secret references are checked;
|
|
284
293
|
- each required parameter is read by its own channel or by document content (`validate_required_parameter_usage`, which backend ingest also calls).
|
|
@@ -511,3 +511,103 @@ def test_malformed_requests_build_no_policy() -> None:
|
|
|
511
511
|
)
|
|
512
512
|
def test_a_policy_without_a_valid_lifespan_gets_the_default(policy: Any) -> None:
|
|
513
513
|
assert api_key_lifespan(policy) == DEFAULT_API_KEY_LIFESPAN
|
|
514
|
+
|
|
515
|
+
|
|
516
|
+
# This enrollment's own limits (unitysvc/unitysvc#2770) ---------------------------
|
|
517
|
+
|
|
518
|
+
|
|
519
|
+
def test_the_enrollment_entry_needs_no_request() -> None:
|
|
520
|
+
policy = _approve(_LOG_APPROVAL, {"object": "enrollment", "limits": {"amount_per_day": "1.00"}})
|
|
521
|
+
assert policy[-1] == {"object": "enrollment", "limits": {"amount_per_day": "1.00"}}
|
|
522
|
+
# Any enrollment may carry one, even of a channel that requests nothing.
|
|
523
|
+
assert build_policy([], [{"object": "enrollment", "limits": {"count_total": 5}}]) == [
|
|
524
|
+
{"object": "enrollment", "limits": {"count_total": 5}}
|
|
525
|
+
]
|
|
526
|
+
assert api_key_lifespan(policy) == DEFAULT_API_KEY_LIFESPAN
|
|
527
|
+
|
|
528
|
+
|
|
529
|
+
@pytest.mark.parametrize(
|
|
530
|
+
("entry", "error"),
|
|
531
|
+
[
|
|
532
|
+
({"object": "enrollment"}, "at least one limit"),
|
|
533
|
+
({"object": "enrollment", "limits": {}}, "at least one limit"),
|
|
534
|
+
({"object": "enrollment", "limits": {"calls": 1}}, "count_/amount_"),
|
|
535
|
+
({"object": "enrollment", "permissions": ["invoke"], "limits": {"count_total": 1}}, "takes only limits"),
|
|
536
|
+
({"object": "enrollment", "options": "a=b", "limits": {"count_total": 1}}, "takes only limits"),
|
|
537
|
+
({"object": "enrollment", "enrollment": "ABC123", "limits": {"count_total": 1}}, "takes only limits"),
|
|
538
|
+
],
|
|
539
|
+
)
|
|
540
|
+
def test_the_enrollment_entry_takes_only_limits(entry: dict[str, Any], error: str) -> None:
|
|
541
|
+
with pytest.raises(ValueError, match=error):
|
|
542
|
+
_approve(_LOG_APPROVAL, entry)
|
|
543
|
+
|
|
544
|
+
|
|
545
|
+
def test_the_enrollment_entry_appears_once() -> None:
|
|
546
|
+
entry = {"object": "enrollment", "limits": {"count_total": 1}}
|
|
547
|
+
with pytest.raises(ValueError, match="listed twice"):
|
|
548
|
+
_approve(_LOG_APPROVAL, entry, entry)
|
|
549
|
+
|
|
550
|
+
|
|
551
|
+
def test_an_approval_may_select_one_of_the_customers_enrollments() -> None:
|
|
552
|
+
policy = _approve(
|
|
553
|
+
_LOG_APPROVAL,
|
|
554
|
+
{"object": "service:me", "permissions": ["read"], "enrollment": "JYY87Y", "limits": {"count_per_day": 3}},
|
|
555
|
+
)
|
|
556
|
+
assert policy[-1] == {
|
|
557
|
+
"object": "service:me",
|
|
558
|
+
"permissions": ["read"],
|
|
559
|
+
"enrollment": "JYY87Y",
|
|
560
|
+
"limits": {"count_per_day": 3},
|
|
561
|
+
}
|
|
562
|
+
|
|
563
|
+
|
|
564
|
+
@pytest.mark.parametrize(
|
|
565
|
+
("extra", "error"),
|
|
566
|
+
[
|
|
567
|
+
({"enrollment": "jyy87y"}, "must be an enrollment code"),
|
|
568
|
+
({"enrollment": "AB-12"}, "must be an enrollment code"),
|
|
569
|
+
({"enrollment": "ABCDIO"}, "must be an enrollment code"),
|
|
570
|
+
({"enrollment": ""}, "must be an enrollment code"),
|
|
571
|
+
({"enrollment": 123}, "must be an enrollment code"),
|
|
572
|
+
({"enrollment": "JYY87Y", "options": "profile=address"}, "takes no options"),
|
|
573
|
+
],
|
|
574
|
+
)
|
|
575
|
+
def test_a_chain_enrollment_names_a_code_and_takes_no_options(extra: dict[str, Any], error: str) -> None:
|
|
576
|
+
with pytest.raises(ValueError, match=error):
|
|
577
|
+
_approve(_LOG_APPROVAL, {"object": "service:me", "permissions": ["read"], **extra})
|
|
578
|
+
|
|
579
|
+
|
|
580
|
+
def test_a_chain_enrollment_is_still_an_approval_of_a_request() -> None:
|
|
581
|
+
with pytest.raises(ValueError, match="is not requested"):
|
|
582
|
+
_approve(_LOG_APPROVAL, {"object": "service:notify", "permissions": ["invoke"], "enrollment": "JYY87Y"})
|
|
583
|
+
with pytest.raises(ValueError, match="requests only"):
|
|
584
|
+
_approve(_LOG_APPROVAL, {"object": "service:me", "permissions": ["delete"], "enrollment": "JYY87Y"})
|
|
585
|
+
|
|
586
|
+
|
|
587
|
+
def test_a_request_never_names_an_enrollment() -> None:
|
|
588
|
+
with pytest.raises(ValueError, match="unknown keys"):
|
|
589
|
+
validate_access_requests(_WHERE, [_dep("service:me", enrollment="JYY87Y")])
|
|
590
|
+
|
|
591
|
+
|
|
592
|
+
@pytest.mark.parametrize(
|
|
593
|
+
"entry",
|
|
594
|
+
[
|
|
595
|
+
_dep("service:*"),
|
|
596
|
+
{"object": "service:*", "permissions": ["deny"], "justification": "x"},
|
|
597
|
+
{"object": "service:*", "permissions": ["invoke"], "justification": "x", "limits": {"count_per_day": 1}},
|
|
598
|
+
],
|
|
599
|
+
)
|
|
600
|
+
def test_service_wildcard_is_refused_by_rule(entry: dict[str, Any]) -> None:
|
|
601
|
+
"""unitysvc/unitysvc#2783: service:* in any form is for manually created keys."""
|
|
602
|
+
with pytest.raises(ValueError, match=r"'service:\*' cannot be requested: every service at once is only for keys"):
|
|
603
|
+
validate_access_requests(_WHERE, [entry])
|
|
604
|
+
|
|
605
|
+
|
|
606
|
+
def test_service_wildcard_is_never_approved() -> None:
|
|
607
|
+
with pytest.raises(ValueError, match=r"'service:\*' cannot be approved: every service at once"):
|
|
608
|
+
build_policy(_REQUESTS, [{"object": "service:*", "permissions": ["invoke"]}], _resolve)
|
|
609
|
+
|
|
610
|
+
|
|
611
|
+
def test_a_seller_cannot_request_the_enrollment_entry() -> None:
|
|
612
|
+
with pytest.raises(ValueError, match="cannot be requested"):
|
|
613
|
+
validate_access_requests(_WHERE, [{"object": "enrollment", "justification": "x", "limits": {"count_total": 1}}])
|
|
@@ -271,6 +271,90 @@ def test_malformed_channel_declarations_are_refused(fields, error):
|
|
|
271
271
|
assert any(error in e for e in validate_channel_parameters(_offering(plus=_plus(**fields))))
|
|
272
272
|
|
|
273
273
|
|
|
274
|
+
@pytest.mark.parametrize(
|
|
275
|
+
("schema", "error"),
|
|
276
|
+
[
|
|
277
|
+
(
|
|
278
|
+
{"type": "nope"},
|
|
279
|
+
"upstream_access_config.plus.params.schema is not a valid JSON Schema: 'nope' is not valid",
|
|
280
|
+
),
|
|
281
|
+
(
|
|
282
|
+
{"type": "object", "properties": {"folder": {"type": "string"}}, "required": "folder"},
|
|
283
|
+
"upstream_access_config.plus.params.schema is not a valid JSON Schema: 'folder' is not of type 'array'",
|
|
284
|
+
),
|
|
285
|
+
(
|
|
286
|
+
{"type": "object", "properties": {"folder": {"$ref": "https://example.com/s.json"}}},
|
|
287
|
+
"upstream_access_config.plus.params.schema: '$ref' is not allowed; a params schema is self-contained",
|
|
288
|
+
),
|
|
289
|
+
],
|
|
290
|
+
)
|
|
291
|
+
def test_an_invalid_params_schema_is_refused(schema, error):
|
|
292
|
+
errors = validate_channel_parameters(_offering(plus=_plus(schema=schema)))
|
|
293
|
+
assert any(e.startswith(error) for e in errors), errors
|
|
294
|
+
|
|
295
|
+
|
|
296
|
+
_TYPED_SCHEMA = {
|
|
297
|
+
"type": "object",
|
|
298
|
+
"properties": {
|
|
299
|
+
"folder": {"type": "string"},
|
|
300
|
+
"count": {"type": "integer"},
|
|
301
|
+
"tier": {"type": "string", "enum": ["basic", "plus"]},
|
|
302
|
+
"contact": {"type": "string", "format": "email"},
|
|
303
|
+
},
|
|
304
|
+
"required": ["folder"],
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
|
|
308
|
+
@pytest.mark.parametrize(
|
|
309
|
+
("defaults", "error"),
|
|
310
|
+
[
|
|
311
|
+
(
|
|
312
|
+
{"count": "three"},
|
|
313
|
+
"upstream_access_config.plus.params.testing_defaults.count: 'three' is not of type 'integer'",
|
|
314
|
+
),
|
|
315
|
+
({"tier": "gold"}, "upstream_access_config.plus.params.testing_defaults.tier: 'gold' is not one of"),
|
|
316
|
+
(
|
|
317
|
+
{"contact": "nobody"},
|
|
318
|
+
"upstream_access_config.plus.params.testing_defaults.contact: 'nobody' is not a 'email'",
|
|
319
|
+
),
|
|
320
|
+
],
|
|
321
|
+
)
|
|
322
|
+
def test_testing_defaults_must_validate_against_the_schema(defaults, error):
|
|
323
|
+
params = {"schema": _TYPED_SCHEMA, "testing_defaults": {"folder": "ops", **defaults}}
|
|
324
|
+
errors = validate_channel_parameters(
|
|
325
|
+
_offering(plus={"base_url": "https://u/{{ params.folder }}", "params": params})
|
|
326
|
+
)
|
|
327
|
+
assert len(errors) == 1, errors
|
|
328
|
+
assert errors[0].startswith(error), errors
|
|
329
|
+
|
|
330
|
+
|
|
331
|
+
def test_testing_defaults_report_one_error_per_problem():
|
|
332
|
+
defaults = {"folder": "ops", "count": "three", "tier": "gold", "contact": "nobody"}
|
|
333
|
+
params = {"schema": _TYPED_SCHEMA, "testing_defaults": defaults}
|
|
334
|
+
errors = validate_channel_parameters(
|
|
335
|
+
_offering(plus={"base_url": "https://u/{{ params.folder }}", "params": params})
|
|
336
|
+
)
|
|
337
|
+
assert [e.split(":")[0] for e in errors] == [
|
|
338
|
+
"upstream_access_config.plus.params.testing_defaults.contact",
|
|
339
|
+
"upstream_access_config.plus.params.testing_defaults.count",
|
|
340
|
+
"upstream_access_config.plus.params.testing_defaults.tier",
|
|
341
|
+
]
|
|
342
|
+
|
|
343
|
+
|
|
344
|
+
def test_valid_testing_defaults_pass():
|
|
345
|
+
defaults = {"folder": "ops", "count": 3, "tier": "plus", "contact": "ops@example.com"}
|
|
346
|
+
params = {"schema": _TYPED_SCHEMA, "testing_defaults": defaults}
|
|
347
|
+
assert (
|
|
348
|
+
validate_channel_parameters(_offering(plus={"base_url": "https://u/{{ params.folder }}", "params": params}))
|
|
349
|
+
== []
|
|
350
|
+
)
|
|
351
|
+
|
|
352
|
+
|
|
353
|
+
def test_a_channel_without_params_is_unaffected():
|
|
354
|
+
offering = _offering(byok={"base_url": "https://u", "api_key": "${ customer_secrets.KEY }"})
|
|
355
|
+
assert validate_channel_parameters(offering) == []
|
|
356
|
+
|
|
357
|
+
|
|
274
358
|
def test_params_must_be_an_object():
|
|
275
359
|
errors = validate_channel_parameters(_offering(plus={"base_url": "https://u", "params": ["folder"]}))
|
|
276
360
|
assert any('params must be {"schema"' in e for e in errors), errors
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|