Skip to content

Commit c8f85d3

Browse files
Adopting ODF TypeName + introduced selector new types + cleanups of old "kind" terminology
1 parent 7b7c053 commit c8f85d3

109 files changed

Lines changed: 2416 additions & 1722 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/internal/resources-framework.md

Lines changed: 117 additions & 108 deletions
Large diffs are not rendered by default.

resources/cli-reference.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ Manage resource contexts
356356
* `list [ls]` — List configured resource contexts
357357
* `delete [rm]` — Delete a remote resource context
358358
* `check` — Check connectivity and authorization for a remote resource context
359-
* `api-resources` — List supported resource kinds in the active context
359+
* `api-resources` — List supported resource types in the active context
360360
* `use` — Switch the current resource context
361361

362362
**Arguments:**
@@ -404,11 +404,11 @@ Register a user-scoped remote context:
404404

405405
kamu context add prod --url https://api.kamu.dev --user
406406

407-
List supported resource kinds in the active context:
407+
List supported resource types in the active context:
408408

409409
kamu ctx api-resources
410410

411-
List supported resource kinds from a specific context:
411+
List supported resource types from a specific context:
412412

413413
kamu ctx api-resources --context prod
414414

@@ -573,7 +573,7 @@ Check all remote contexts:
573573

574574
## `kamu context api-resources`
575575

576-
List supported resource kinds in the active context
576+
List supported resource types in the active context
577577

578578
**Usage:** `kamu context api-resources [OPTIONS]`
579579

@@ -599,7 +599,7 @@ List supported resource kinds in the active context
599599
Parquet columnar storage. Only available when exporting to file(s)
600600

601601

602-
Lists resource kinds supported by the active context.
602+
Lists resource types supported by the active context.
603603

604604
If the active context is `local`, this targets the current workspace. If the
605605
active context points to a remote server, this targets that remote GraphQL API.
@@ -608,15 +608,15 @@ Use `--context` to override the current context for this invocation only.
608608

609609
**Examples:**
610610

611-
List supported resource kinds in the active context:
611+
List supported resource types in the active context:
612612

613613
kamu ctx api-resources
614614

615-
List supported resource kinds from a specific context:
615+
List supported resource types from a specific context:
616616

617617
kamu ctx api-resources --context prod
618618

619-
List supported resource kinds in JSON:
619+
List supported resource types in JSON:
620620

621621
kamu ctx api-resources -o json
622622

@@ -685,7 +685,7 @@ Delete datasets explicitly:
685685

686686
kamu delete datasets my.dataset
687687

688-
Delete a dataset using the dataset pseudo-kind selector:
688+
Delete a dataset using the dataset pseudo-type selector:
689689

690690
kamu delete dataset/my.dataset
691691

@@ -697,31 +697,31 @@ Delete a single resource:
697697

698698
kamu delete storages warehouse
699699

700-
Delete same-kind resources by name pattern:
700+
Delete same-type resources by name pattern:
701701

702702
kamu delete vs app-%
703703

704-
Delete all resources of a kind:
704+
Delete all resources of a type:
705705

706706
kamu delete storages --all
707707

708-
Delete all resources across kinds:
708+
Delete all resources across types:
709709

710710
kamu delete all
711711

712712
Delete resources using slash selectors:
713713

714714
kamu delete vs/my-vars ss/my-secrets
715715

716-
Delete the same exact name across a matched kind pattern:
716+
Delete the same exact name across a matched type pattern:
717717

718718
kamu delete s% db-creds
719719

720-
Delete matched resources across a kind pattern and name pattern:
720+
Delete matched resources across a type pattern and name pattern:
721721

722722
kamu delete s%/db-%
723723

724-
Delete all resources of a kind using a slash selector:
724+
Delete all resources of a type using a slash selector:
725725

726726
kamu delete storages/all
727727

@@ -777,7 +777,7 @@ Returns manifest representation of a resource
777777

778778
**Arguments:**
779779

780-
* `<ARGS>` — Resource selector(s): `kind name...` or `kind/name...`
780+
* `<ARGS>` — Resource selector(s): `type name...` or `type/name...`
781781

782782
**Options:**
783783

@@ -798,7 +798,7 @@ Returns manifest representation of a resource
798798

799799
Returns the current state of one or more resources as YAML or JSON.
800800

801-
Only real resource kinds supported by the active context are accepted.
801+
Only real resource types supported by the active context are accepted.
802802
Datasets are intentionally not supported by this command.
803803

804804
By default this command returns the full resource view, including status.
@@ -820,23 +820,23 @@ Get the apply-compatible spec manifest:
820820

821821
kamu get vs my-vars --spec
822822

823-
Get multiple resources of the same kind:
823+
Get multiple resources of the same type:
824824

825825
kamu get variablesets vars-a vars-b
826826

827-
Get same-kind resources by name pattern:
827+
Get same-type resources by name pattern:
828828

829829
kamu get vs app-%
830830

831831
Get multiple resources by slash-separated ref form:
832832

833833
kamu get vs/vars-a ss/db-creds
834834

835-
Get the same exact name across a matched kind pattern:
835+
Get the same exact name across a matched type pattern:
836836

837837
kamu get s% db-creds
838838

839-
Get matched resources across a kind pattern and name pattern:
839+
Get matched resources across a type pattern and name pattern:
840840

841841
kamu get s%/db-%
842842

@@ -1063,7 +1063,7 @@ To list datasets explicitly:
10631063

10641064
kamu list datasets
10651065

1066-
To list all resources across all kinds:
1066+
To list all resources across all types:
10671067

10681068
kamu list all
10691069

@@ -1796,7 +1796,7 @@ Show resource summary for the active context
17961796
Possible values: `table`, `json`, `yaml`
17971797

17981798

1799-
Shows resource counts by kind and reconciliation phase for the active context.
1799+
Shows resource counts by type and reconciliation phase for the active context.
18001800

18011801
If the active context is `local`, commands target the current workspace. If the
18021802
active context points to a remote server, commands target that remote GraphQL

resources/di.puml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ interface "GetResourceByIdUseCase" <<i>>
9393
interface "InitOnStartup" <<i>>
9494
interface "JwtTokenIssuer" <<i>>
9595
interface "ListAllResourcesUseCase" <<i>>
96-
interface "ListResourcesByKindUseCase" <<i>>
96+
interface "ListResourcesByTypeUseCase" <<i>>
9797
interface "MessageConsumer" <<i>>
9898
interface "MessageConsumerT" <<i>>
9999
interface "MetadataQueryService" <<i>>
@@ -138,7 +138,6 @@ interface "ResourceContextStore" <<i>>
138138
interface "ResourceCrudDispatcher" <<i>>
139139
interface "ResourceFacade" <<i>>
140140
interface "ResourceFacadeFactory" <<i>>
141-
interface "ResourceKindLookupService" <<i>>
142141
interface "ResourceLifecycleEventDispatcher" <<i>>
143142
interface "ResourceLoader" <<i>>
144143
interface "ResourceManifestDiscoveryService" <<i>>
@@ -153,6 +152,7 @@ interface "ResourceSelectorResolutionService" <<i>>
153152
interface "ResourceSpecSanitizer" <<i>>
154153
interface "ResourceSpecViewDispatcher" <<i>>
155154
interface "ResourceSummaryService" <<i>>
155+
interface "ResourceTypeLookupService" <<i>>
156156
interface "SchemaService" <<i>>
157157
interface "SearchEntitySchemaProvider" <<i>>
158158
interface "SearchService" <<i>>
@@ -364,7 +364,6 @@ class "ResourceContextReporter"
364364
class "ResourceContextResolver"
365365
class "ResourceContextTestService"
366366
class "ResourceFacadeFactoryImpl"
367-
class "ResourceKindLookupServiceImpl"
368367
class "ResourceLifecycleMessageConsumer"
369368
class "ResourceLoaderImpl"
370369
class "ResourceManifestDiscoveryServiceImpl"
@@ -373,6 +372,7 @@ class "ResourceSelectionResolutionServiceImpl"
373372
class "ResourceSelectionSyntaxServiceImpl"
374373
class "ResourceSelectorResolutionServiceImpl"
375374
class "ResourceSummaryServiceImpl"
375+
class "ResourceTypeLookupServiceImpl"
376376
class "RunInfoDir" <<singleton>>
377377
class "SchemaServiceImpl"
378378
class "SearchIndexerConfig" <<singleton>>
@@ -381,7 +381,7 @@ class "SecretSetApplyResourceUseCaseImpl"
381381
class "SecretSetDeleteResourcesUseCaseImpl"
382382
class "SecretSetEventStoreBridge"
383383
class "SecretSetGetResourceByIdUseCaseImpl"
384-
class "SecretSetListResourcesByKindUseCaseImpl"
384+
class "SecretSetListResourcesByTypeUseCaseImpl"
385385
class "SecretSetReconcileResourceUseCaseImpl"
386386
class "SecretSetReconcilerImpl"
387387
class "SecretSetResourceAggregateLoaderImpl"
@@ -445,7 +445,7 @@ class "StorageApplyResourceUseCaseImpl"
445445
class "StorageDeleteResourcesUseCaseImpl"
446446
class "StorageEventStoreBridge"
447447
class "StorageGetResourceByIdUseCaseImpl"
448-
class "StorageListResourcesByKindUseCaseImpl"
448+
class "StorageListResourcesByTypeUseCaseImpl"
449449
class "StorageReconcileResourceUseCaseImpl"
450450
class "StorageReconcilerImpl"
451451
class "StorageResourceAggregateLoaderImpl"
@@ -472,7 +472,7 @@ class "VariableSetApplyResourceUseCaseImpl"
472472
class "VariableSetDeleteResourcesUseCaseImpl"
473473
class "VariableSetEventStoreBridge"
474474
class "VariableSetGetResourceByIdUseCaseImpl"
475-
class "VariableSetListResourcesByKindUseCaseImpl"
475+
class "VariableSetListResourcesByTypeUseCaseImpl"
476476
class "VariableSetReconcileResourceUseCaseImpl"
477477
class "VariableSetReconcilerImpl"
478478
class "VariableSetResourceAggregateLoaderImpl"
@@ -815,20 +815,20 @@ class "WsSmartTransferProtocolClient"
815815
"ResourceFacadeFactoryImpl" --> "ResourceFacade"
816816
"ResourceFacadeFactoryImpl" --> "AccessTokenRegistryService"
817817
"ResourceFacadeFactoryImpl" --> "ResourceContextResolver"
818-
"ResourceKindLookupService" <|-- "ResourceKindLookupServiceImpl"
819-
"ResourceKindLookupServiceImpl" --> "ResourceFacadeFactory"
820818
"ResourceManifestDiscoveryService" <|-- "ResourceManifestDiscoveryServiceImpl"
821819
"ResourceManifestExecutionService" <|-- "ResourceManifestExecutionServiceImpl"
822820
"ResourceSelectionResolutionService" <|-- "ResourceSelectionResolutionServiceImpl"
823821
"ResourceSelectionSyntaxService" <|-- "ResourceSelectionSyntaxServiceImpl"
824-
"ResourceSelectionSyntaxServiceImpl" --> "ResourceKindLookupService"
825822
"ResourceSelectionSyntaxServiceImpl" --> "ResourceSelectorResolutionService"
823+
"ResourceSelectionSyntaxServiceImpl" --> "ResourceTypeLookupService"
826824
"ResourceSelectorResolutionService" <|-- "ResourceSelectorResolutionServiceImpl"
827825
"ResourceSummaryService" <|-- "ResourceSummaryServiceImpl"
828826
"ResourceSummaryServiceImpl" --> "ResourceFacade"
829827
"ResourceSummaryServiceImpl" --> "CurrentAccountSubject"
830828
"ResourceSummaryServiceImpl" --> "AccessTokenRegistryService"
831829
"ResourceSummaryServiceImpl" --> "ResourceContextResolver"
830+
"ResourceTypeLookupService" <|-- "ResourceTypeLookupServiceImpl"
831+
"ResourceTypeLookupServiceImpl" --> "ResourceFacadeFactory"
832832
"WorkspaceService" --> "bool"
833833
"WorkspaceService" --> "WorkspaceLayout"
834834
"DatasetEnvVarMutationAdapter" <|-- "DatasetEnvVarMutationAdapterImpl"
@@ -861,7 +861,7 @@ class "WsSmartTransferProtocolClient"
861861
"SecretSetResourceCrudDispatcher" --> "ApplyResourceUseCase"
862862
"SecretSetResourceCrudDispatcher" --> "DeleteResourcesUseCase"
863863
"SecretSetResourceCrudDispatcher" --> "GetResourceByIdUseCase"
864-
"SecretSetResourceCrudDispatcher" --> "ListResourcesByKindUseCase"
864+
"SecretSetResourceCrudDispatcher" --> "ListResourcesByTypeUseCase"
865865
"ResourcePresentationDispatcher" <|-- "SecretSetResourcePresentationDispatcher"
866866
"ResourceSpecViewDispatcher" <|-- "SecretSetSpecViewDispatcher"
867867
"SecretSetSpecViewDispatcher" --> "SecretsEncryptionConfig"
@@ -870,7 +870,7 @@ class "WsSmartTransferProtocolClient"
870870
"VariableSetResourceCrudDispatcher" --> "ApplyResourceUseCase"
871871
"VariableSetResourceCrudDispatcher" --> "DeleteResourcesUseCase"
872872
"VariableSetResourceCrudDispatcher" --> "GetResourceByIdUseCase"
873-
"VariableSetResourceCrudDispatcher" --> "ListResourcesByKindUseCase"
873+
"VariableSetResourceCrudDispatcher" --> "ListResourcesByTypeUseCase"
874874
"ResourcePresentationDispatcher" <|-- "VariableSetResourcePresentationDispatcher"
875875
"ApplyResourceUseCase" <|-- "SecretSetApplyResourceUseCaseImpl"
876876
"SecretSetApplyResourceUseCaseImpl" --> "GenericResourceQueryService"
@@ -890,8 +890,8 @@ class "WsSmartTransferProtocolClient"
890890
"SecretSetEventStoreBridge" --> "ResourceRawEventStore"
891891
"GetResourceByIdUseCase" <|-- "SecretSetGetResourceByIdUseCaseImpl"
892892
"SecretSetGetResourceByIdUseCaseImpl" --> "TypedResourceQueryService"
893-
"ListResourcesByKindUseCase" <|-- "SecretSetListResourcesByKindUseCaseImpl"
894-
"SecretSetListResourcesByKindUseCaseImpl" --> "TypedResourceQueryService"
893+
"ListResourcesByTypeUseCase" <|-- "SecretSetListResourcesByTypeUseCaseImpl"
894+
"SecretSetListResourcesByTypeUseCaseImpl" --> "TypedResourceQueryService"
895895
"ReconcileResourceUseCase" <|-- "SecretSetReconcileResourceUseCaseImpl"
896896
"SecretSetReconcileResourceUseCaseImpl" --> "Catalog"
897897
"SecretSetReconcileResourceUseCaseImpl" --> "SystemTimeSource"
@@ -922,8 +922,8 @@ class "WsSmartTransferProtocolClient"
922922
"VariableSetEventStoreBridge" --> "ResourceRawEventStore"
923923
"GetResourceByIdUseCase" <|-- "VariableSetGetResourceByIdUseCaseImpl"
924924
"VariableSetGetResourceByIdUseCaseImpl" --> "TypedResourceQueryService"
925-
"ListResourcesByKindUseCase" <|-- "VariableSetListResourcesByKindUseCaseImpl"
926-
"VariableSetListResourcesByKindUseCaseImpl" --> "TypedResourceQueryService"
925+
"ListResourcesByTypeUseCase" <|-- "VariableSetListResourcesByTypeUseCaseImpl"
926+
"VariableSetListResourcesByTypeUseCaseImpl" --> "TypedResourceQueryService"
927927
"ReconcileResourceUseCase" <|-- "VariableSetReconcileResourceUseCaseImpl"
928928
"VariableSetReconcileResourceUseCaseImpl" --> "Catalog"
929929
"VariableSetReconcileResourceUseCaseImpl" --> "SystemTimeSource"
@@ -1181,7 +1181,7 @@ class "WsSmartTransferProtocolClient"
11811181
"StorageResourceCrudDispatcher" --> "ApplyResourceUseCase"
11821182
"StorageResourceCrudDispatcher" --> "DeleteResourcesUseCase"
11831183
"StorageResourceCrudDispatcher" --> "GetResourceByIdUseCase"
1184-
"StorageResourceCrudDispatcher" --> "ListResourcesByKindUseCase"
1184+
"StorageResourceCrudDispatcher" --> "ListResourcesByTypeUseCase"
11851185
"ResourcePresentationDispatcher" <|-- "StorageResourcePresentationDispatcher"
11861186
"ApplyResourceUseCase" <|-- "StorageApplyResourceUseCaseImpl"
11871187
"StorageApplyResourceUseCaseImpl" --> "GenericResourceQueryService"
@@ -1201,8 +1201,8 @@ class "WsSmartTransferProtocolClient"
12011201
"StorageEventStoreBridge" --> "ResourceRawEventStore"
12021202
"GetResourceByIdUseCase" <|-- "StorageGetResourceByIdUseCaseImpl"
12031203
"StorageGetResourceByIdUseCaseImpl" --> "TypedResourceQueryService"
1204-
"ListResourcesByKindUseCase" <|-- "StorageListResourcesByKindUseCaseImpl"
1205-
"StorageListResourcesByKindUseCaseImpl" --> "TypedResourceQueryService"
1204+
"ListResourcesByTypeUseCase" <|-- "StorageListResourcesByTypeUseCaseImpl"
1205+
"StorageListResourcesByTypeUseCaseImpl" --> "TypedResourceQueryService"
12061206
"ReconcileResourceUseCase" <|-- "StorageReconcileResourceUseCaseImpl"
12071207
"StorageReconcileResourceUseCaseImpl" --> "Catalog"
12081208
"StorageReconcileResourceUseCaseImpl" --> "SystemTimeSource"

0 commit comments

Comments
 (0)