diff --git a/config/commands/site.yaml b/config/commands/site.yaml index 854d925..753950c 100644 --- a/config/commands/site.yaml +++ b/config/commands/site.yaml @@ -6,7 +6,6 @@ include_options: [global/*] subcommands: - name: create wait: Ready - links: [skupper/site-configuration] description: | Create a site. examples: | diff --git a/config/commands/token.yaml b/config/commands/token.yaml index 375b710..423dca8 100644 --- a/config/commands/token.yaml +++ b/config/commands/token.yaml @@ -10,9 +10,6 @@ subcommands: wait: Ready resource: access-grant platforms: [Kubernetes] - # XXX Inherit! vv - related_concepts: [access-token] - related_resources: [access-grant, access-token] related_commands: [token/redeem] links: [skupper/site-linking] description: | @@ -78,9 +75,6 @@ subcommands: enable it. - name: redeem resource: access-token - # XXX Inherit! - related_concepts: [access-token] - related_resources: [access-grant, access-token] related_commands: [token/issue] links: [skupper/site-linking] description: | diff --git a/input/commands/connector/create.md b/input/commands/connector/create.md index 2ad489f..74d443e 100644 --- a/input/commands/connector/create.md +++ b/input/commands/connector/create.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/connector.html - title: Listener create command url: /commands/listener/create.html +- title: Listener command + url: /commands/listener/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/connector/delete.md b/input/commands/connector/delete.md index 09d4e32..bafe0e3 100644 --- a/input/commands/connector/delete.md +++ b/input/commands/connector/delete.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/connector.html - title: Listener delete command url: /commands/listener/delete.html +- title: Listener command + url: /commands/listener/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/connector/generate.md b/input/commands/connector/generate.md index 90d76f3..bbead0f 100644 --- a/input/commands/connector/generate.md +++ b/input/commands/connector/generate.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/connector.html - title: Listener generate command url: /commands/listener/generate.html +- title: Listener command + url: /commands/listener/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/connector/status.md b/input/commands/connector/status.md index a9c9228..d971c94 100644 --- a/input/commands/connector/status.md +++ b/input/commands/connector/status.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/connector.html - title: Listener status command url: /commands/listener/status.html +- title: Listener command + url: /commands/listener/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/connector/update.md b/input/commands/connector/update.md index a9c5f8e..e96eafd 100644 --- a/input/commands/connector/update.md +++ b/input/commands/connector/update.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/connector.html - title: Listener update command url: /commands/listener/update.html +- title: Listener command + url: /commands/listener/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/link/delete.md b/input/commands/link/delete.md index 3df4f86..6a2eb80 100644 --- a/input/commands/link/delete.md +++ b/input/commands/link/delete.md @@ -7,6 +7,8 @@ refdog_links: url: /concepts/link.html - title: Link resource url: /resources/link.html +- title: Token command + url: /commands/token/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/link/generate.md b/input/commands/link/generate.md index 9489a92..d851e3a 100644 --- a/input/commands/link/generate.md +++ b/input/commands/link/generate.md @@ -7,6 +7,8 @@ refdog_links: url: /concepts/link.html - title: Link resource url: /resources/link.html +- title: Token command + url: /commands/token/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/link/status.md b/input/commands/link/status.md index 4a1747a..b841786 100644 --- a/input/commands/link/status.md +++ b/input/commands/link/status.md @@ -7,6 +7,8 @@ refdog_links: url: /concepts/link.html - title: Link resource url: /resources/link.html +- title: Token command + url: /commands/token/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/link/update.md b/input/commands/link/update.md index 0ba0eef..60fe6d0 100644 --- a/input/commands/link/update.md +++ b/input/commands/link/update.md @@ -7,6 +7,8 @@ refdog_links: url: /concepts/link.html - title: Link resource url: /resources/link.html +- title: Token command + url: /commands/token/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/listener/create.md b/input/commands/listener/create.md index ebf0c81..a82611b 100644 --- a/input/commands/listener/create.md +++ b/input/commands/listener/create.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/listener.html - title: Connector create command url: /commands/connector/create.html +- title: Connector command + url: /commands/connector/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/listener/delete.md b/input/commands/listener/delete.md index 745050b..ebcbace 100644 --- a/input/commands/listener/delete.md +++ b/input/commands/listener/delete.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/listener.html - title: Connector delete command url: /commands/connector/delete.html +- title: Connector command + url: /commands/connector/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/listener/generate.md b/input/commands/listener/generate.md index 6e1c7ae..8216960 100644 --- a/input/commands/listener/generate.md +++ b/input/commands/listener/generate.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/listener.html - title: Connector generate command url: /commands/connector/generate.html +- title: Connector command + url: /commands/connector/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/listener/status.md b/input/commands/listener/status.md index b3059fd..3ce7ae9 100644 --- a/input/commands/listener/status.md +++ b/input/commands/listener/status.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/listener.html - title: Connector status command url: /commands/connector/status.html +- title: Connector command + url: /commands/connector/index.html refdog_object_has_attributes: true --- diff --git a/input/commands/listener/update.md b/input/commands/listener/update.md index 3e3f3c2..0b5d5ea 100644 --- a/input/commands/listener/update.md +++ b/input/commands/listener/update.md @@ -9,6 +9,8 @@ refdog_links: url: /resources/listener.html - title: Connector update command url: /commands/connector/update.html +- title: Connector command + url: /commands/connector/index.html refdog_object_has_attributes: true --- diff --git a/python/commands.py b/python/commands.py index a9ff16d..c746278 100644 --- a/python/commands.py +++ b/python/commands.py @@ -388,6 +388,42 @@ def description(self): return value + @property + def related_concepts(self): + concepts = list(super().related_concepts) + + if self.parent: + concepts.extend(self.parent.related_concepts) + + return concepts + + @property + def related_resources(self): + resources = list(super().related_resources) + + if self.parent: + resources.extend(self.parent.related_resources) + + return resources + + @property + def related_commands(self): + commands = list(super().related_commands) + + if self.parent: + commands.extend(self.parent.related_commands) + + return commands + + @property + def links(self): + links = set(super().links) + + if self.parent: + links.update(self.parent.links) + + return links + class Option(ModelObjectAttribute): type = object_property("type") required = object_property("required", default=False)