From 2ae3c80eb87b792f437421d127ea8b7dbd41f7b4 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 2 Jun 2022 09:55:31 -0700 Subject: [PATCH] Avoid duplicating schema of 'RegistryMirror' --- .../vscode/concourse/PipelineYmlSchema.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java index 50863b15a..5a816a90b 100644 --- a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java +++ b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java @@ -607,14 +607,16 @@ public class PipelineYmlSchema implements YamlSchema { put.require(Constraints.requireAtMostOneOf("rebase", "merge")); resourceTypes.def("git", source, get, put); } + + // Shared by docker-image and registry-image + AbstractType registry_mirror = f.ybean("RegistryMirror"); + addProp(registry_mirror, "host", t_ne_string).isPrimary(true); + addProp(registry_mirror, "username", t_ne_string); + addProp(registry_mirror, "password", t_ne_string); + //docker-image: { - AbstractType registry_mirror = f.ybean("RegistryMirror"); - addProp(registry_mirror, "host", t_ne_string).isPrimary(true); - addProp(registry_mirror, "username", t_ne_string); - addProp(registry_mirror, "password", t_ne_string); - AbstractType source = f.ybean("DockerImageSource"); addProp(source, "repository", t_ne_string).isPrimary(true); addProp(source, "tag", t_ne_string); @@ -688,14 +690,7 @@ public class PipelineYmlSchema implements YamlSchema { addProp(source, "aws_role_arn", t_ne_string); addProp(source, "aws_role_arns", t_strings); addProp(source, "debug", t_boolean); - { - AbstractType registry_mirror = f.ybean("RegistryMirror"); - addProp(registry_mirror, "host", t_ne_string).isPrimary(true); - addProp(registry_mirror, "username", t_ne_string); - addProp(registry_mirror, "password", t_ne_string); - - addProp(source, "registry_mirror", registry_mirror); - } + addProp(source, "registry_mirror", registry_mirror); { AbstractType contentTrust = f.ybean("RegistryImageContentTrust"); addProp(contentTrust, "server", t_ne_string);