From 8c81e2659935a43e83356412c78f5e117b6294ef Mon Sep 17 00:00:00 2001 From: Alexander Mattoni <5110855+mattoni@users.noreply.github.com> Date: Wed, 28 Feb 2024 11:52:27 -0800 Subject: [PATCH 1/2] add identifier includes to all resources that have them --- components/schemas/containers/ContainerIncludes.yml | 5 +++++ .../schemas/containers/instances/InstanceIncludes.yml | 8 +++++++- components/schemas/dns/records/RecordIncludes.yml | 4 +++- components/schemas/images/ImageIncludes.yml | 10 +++++++++- components/schemas/images/sources/SourceIncludes.yml | 6 +++++- components/schemas/includes/IdentifierIncludes.yml | 7 +++++++ components/schemas/includes/IntegrationsIncludes.yml | 5 +++++ .../auto-scale/groups/AutoScaleGroupIncludes.yml | 2 +- components/schemas/infrastructure/ips/PoolIncludes.yml | 2 +- .../schemas/infrastructure/servers/ServerIncludes.yml | 2 +- components/schemas/pipelines/PipelineIncludes.yml | 3 ++- 11 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 components/schemas/includes/IdentifierIncludes.yml create mode 100644 components/schemas/includes/IntegrationsIncludes.yml diff --git a/components/schemas/containers/ContainerIncludes.yml b/components/schemas/containers/ContainerIncludes.yml index 1e57d0f5..7697a5fe 100644 --- a/components/schemas/containers/ContainerIncludes.yml +++ b/components/schemas/containers/ContainerIncludes.yml @@ -10,5 +10,10 @@ properties: "$ref": "../includes/StackBuildIncludes.yml" stacks: "$ref": "../includes/StackIncludes.yml" + "stacks:identifiers": + $ref: ../includes/IdentifierIncludes.yml environments: "$ref": "../includes/EnvironmentIncludes.yml" + "environments:identifiers": + $ref: ../includes/IdentifierIncludes.yml + diff --git a/components/schemas/containers/instances/InstanceIncludes.yml b/components/schemas/containers/instances/InstanceIncludes.yml index 7084433b..92c9b31b 100644 --- a/components/schemas/containers/instances/InstanceIncludes.yml +++ b/components/schemas/containers/instances/InstanceIncludes.yml @@ -9,8 +9,14 @@ properties: locations: "$ref": "../../includes/LocationsIncludes.yml" providers: - "$ref": "../../includes/ProvidersIncludes.yml" + "$ref": "../../includes/IntegrationsIncludes.yml" + "providers:identifiers": + $ref: ../../includes/IdentifierIncludes.yml containers: "$ref": "../../includes/ContainersIncludes.yml" + "containers:identifiers": + $ref: ../../includes/IdentifierIncludes.yml environments: "$ref": "../../includes/EnvironmentIncludes.yml" + "environments:identifiers": + $ref: ../../includes/IdentifierIncludes.yml diff --git a/components/schemas/dns/records/RecordIncludes.yml b/components/schemas/dns/records/RecordIncludes.yml index dc358985..7579469b 100644 --- a/components/schemas/dns/records/RecordIncludes.yml +++ b/components/schemas/dns/records/RecordIncludes.yml @@ -5,4 +5,6 @@ properties: creators: "$ref": "../../includes/CreatorInclude.yml" containers: - "$ref": "../../includes/ContainersIncludes.yml" \ No newline at end of file + "$ref": "../../includes/ContainersIncludes.yml" + "containers:identifiers": + $ref: ../../includes/IdentifierIncludes.yml \ No newline at end of file diff --git a/components/schemas/images/ImageIncludes.yml b/components/schemas/images/ImageIncludes.yml index 29796903..0fed79ae 100644 --- a/components/schemas/images/ImageIncludes.yml +++ b/components/schemas/images/ImageIncludes.yml @@ -8,5 +8,13 @@ properties: "$ref": "../includes/StackBuildIncludes.yml" stacks: "$ref": "../includes/StackIncludes.yml" + "stacks:identifiers": + $ref: ../includes/IdentifierIncludes.yml sources: - "$ref": "../includes/ImageSourceIncludes.yml" \ No newline at end of file + "$ref": "../includes/ImageSourceIncludes.yml" + "sources:identifiers": + $ref: ../includes/IdentifierIncludes.yml + integrations: + "$ref": "../includes/IntegrationsIncludes.yml" + "integrations:identifiers": + $ref: ../includes/IdentifierIncludes.yml diff --git a/components/schemas/images/sources/SourceIncludes.yml b/components/schemas/images/sources/SourceIncludes.yml index 5fa828cc..c3468b0b 100644 --- a/components/schemas/images/sources/SourceIncludes.yml +++ b/components/schemas/images/sources/SourceIncludes.yml @@ -3,4 +3,8 @@ description: A resource associate with an image source. type: object properties: creators: - "$ref": "../../includes/CreatorInclude.yml" \ No newline at end of file + "$ref": "../../includes/CreatorInclude.yml" + integrations: + "$ref": "../../includes/IntegrationsIncludes.yml" + "integrations:identifiers": + $ref: ../../includes/IdentifierIncludes.yml \ No newline at end of file diff --git a/components/schemas/includes/IdentifierIncludes.yml b/components/schemas/includes/IdentifierIncludes.yml new file mode 100644 index 00000000..7ca16f0c --- /dev/null +++ b/components/schemas/includes/IdentifierIncludes.yml @@ -0,0 +1,7 @@ +title: IdentifierIncludes +type: object +description: A map of identifiers to an array of resource IDs that are associated with it. All IDs point to the same type of resource. +additionalProperties: + type: array + items: + $ref: "../ID.yml" diff --git a/components/schemas/includes/IntegrationsIncludes.yml b/components/schemas/includes/IntegrationsIncludes.yml new file mode 100644 index 00000000..c9966ad3 --- /dev/null +++ b/components/schemas/includes/IntegrationsIncludes.yml @@ -0,0 +1,5 @@ +title: IntegrationsIncludes +description: A resource thats associated with an integration. +type: object +additionalProperties: + $ref: ../hubs/integrations/Integration.yml \ No newline at end of file diff --git a/components/schemas/infrastructure/auto-scale/groups/AutoScaleGroupIncludes.yml b/components/schemas/infrastructure/auto-scale/groups/AutoScaleGroupIncludes.yml index cb27857f..fa157af5 100644 --- a/components/schemas/infrastructure/auto-scale/groups/AutoScaleGroupIncludes.yml +++ b/components/schemas/infrastructure/auto-scale/groups/AutoScaleGroupIncludes.yml @@ -3,7 +3,7 @@ description: All includable resource linkable to the given auto-scale group. type: object properties: providers: - "$ref": "../../../includes/ProvidersIncludes.yml" + "$ref": "../../../includes/IntegrationsIncludes.yml" models: "$ref": "../../../includes/ServerModelsIncludes.yml" locations: diff --git a/components/schemas/infrastructure/ips/PoolIncludes.yml b/components/schemas/infrastructure/ips/PoolIncludes.yml index becec7a0..12119e2e 100644 --- a/components/schemas/infrastructure/ips/PoolIncludes.yml +++ b/components/schemas/infrastructure/ips/PoolIncludes.yml @@ -12,6 +12,6 @@ properties: servers: "$ref": "../../includes/ServersIncludes.yml" providers: - "$ref": "../../includes/ProvidersIncludes.yml" + "$ref": "../../includes/IntegrationsIncludes.yml" locations: "$ref": "../../includes/LocationsIncludes.yml" diff --git a/components/schemas/infrastructure/servers/ServerIncludes.yml b/components/schemas/infrastructure/servers/ServerIncludes.yml index 99af6b1c..40a2a3e0 100644 --- a/components/schemas/infrastructure/servers/ServerIncludes.yml +++ b/components/schemas/infrastructure/servers/ServerIncludes.yml @@ -11,4 +11,4 @@ properties: models: "$ref": "../../includes/ServerModelIncludes.yml" providers: - "$ref": "../../includes/ProvidersIncludes.yml" + "$ref": "../../includes/IntegrationsIncludes.yml" diff --git a/components/schemas/pipelines/PipelineIncludes.yml b/components/schemas/pipelines/PipelineIncludes.yml index c89638d8..94b0f887 100644 --- a/components/schemas/pipelines/PipelineIncludes.yml +++ b/components/schemas/pipelines/PipelineIncludes.yml @@ -7,7 +7,6 @@ properties: name: type: string description: A name value. - # TODO - what is this name value components: type: object description: A record of resources that can be associated with the pipeline. @@ -19,3 +18,5 @@ properties: - "$ref": "../stacks/builds/StackBuild.yml" - "$ref": "../images/Image.yml" - "$ref": "../images/sources/ImageSource.yml" + "components:identifiers": + $ref: ../includes/IdentifierIncludes.yml From e4c23b308b220b975f9158aaac74e3baee1f3060 Mon Sep 17 00:00:00 2001 From: Alexander Mattoni <5110855+mattoni@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:11:40 -0800 Subject: [PATCH 2/2] Image integration is an ID in return --- components/schemas/images/Image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/schemas/images/Image.yml b/components/schemas/images/Image.yml index 4d0731df..883db54b 100644 --- a/components/schemas/images/Image.yml +++ b/components/schemas/images/Image.yml @@ -78,7 +78,7 @@ properties: properties: integration_id: description: The ID of the Integration used to do the build. - $ref: ../HybridIdentifer.yml + $ref: ../ID.yml config: type: object description: Configuration settings for the image.