Skip to content

Commit 59ae479

Browse files
committed
Add deployment-specific metadata properties for projects, repositories and app identities
Motivation: Organizations running Central Dogma often need to attach deployment-specific properties, such as the identifier of the owning service, to projects, repositories and app identities. There was no way to declare, validate, store or retrieve such properties without forking the metadata model. Modifications: - Add a `metadataProperties` section to `dogma.json` (and `CentralDogmaBuilder.metadataProperties()`) that declares a JSON Schema per resource type (`project`, `repo` and `appIdentity`). - Accept an optional `properties` object in the creation APIs of projects, repositories and app identities, and validate it against the declared schema with json-schema-validator. A non-conforming request is rejected while undeclared properties are silently dropped, so that a new property can be declared with a rolling restart. - Persist the validated properties in `ProjectMetadata`, `RepositoryMetadata` and `AppIdentity`, and return them via the retrieval APIs. - Add `GET /api/v1/metadataProperties` that exposes the declared schemas so that clients such as the web UI can render input forms. Result: - The server-side extension point of #1346 is now available; the web UI form rendering follows in a stacked PR. - Administrators can require and validate deployment-specific metadata properties at creation time. Nothing changes when `metadataProperties` is not configured.
1 parent 5afa110 commit 59ae479

51 files changed

Lines changed: 1845 additions & 159 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.

NOTICE.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,11 @@ This product depends on Hibernate Validator, distributed by Red Hat, Inc:
200200
* License: licenses/LICENSE.hibernate.al20.txt
201201
* Homepage: http://hibernate.org/validator/
202202

203+
This product depends on itu, distributed by Morten Haraldsen:
204+
205+
* License: licenses/LICENSE.itu.al20.txt (Apache License v2.0)
206+
* Homepage: https://github.com/ethlo/itu
207+
203208
This product depends on Jackson, distributed by FasterXML, LLC:
204209

205210
* License: licenses/LICENSE.jackson.al20.txt (Apache License v2.0)
@@ -260,6 +265,11 @@ This product depends on JSch, distributed by JCraft, Inc:
260265
* License: licenses/LICENSE.jsch.bsd.txt (New BSD License)
261266
* Homepage: http://www.jcraft.com/jsch/
262267

268+
This product depends on json-schema-validator, distributed by networknt:
269+
270+
* License: licenses/LICENSE.json-schema-validator.al20.txt (Apache License v2.0)
271+
* Homepage: https://github.com/networknt/json-schema-validator
272+
263273
This product depends on JsonUnit, distributed by Lukáš Křečan:
264274

265275
* License: licenses/LICENSE.jsonunit.al20.txt (Apache License v2.0)

common/src/main/java/com/linecorp/centraldogma/internal/api/v1/CreateProjectRequest.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import com.fasterxml.jackson.annotation.JsonCreator;
2626
import com.fasterxml.jackson.annotation.JsonProperty;
27+
import com.fasterxml.jackson.databind.JsonNode;
2728
import com.google.common.base.MoreObjects;
2829
import com.google.common.collect.ImmutableSet;
2930

@@ -35,14 +36,18 @@ public class CreateProjectRequest {
3536
private final String name;
3637
private final Set<String> owners;
3738
private final Set<String> members;
39+
@Nullable
40+
private final JsonNode properties;
3841

3942
@JsonCreator
4043
public CreateProjectRequest(@JsonProperty("name") String name,
4144
@JsonProperty("owners") @Nullable Set<String> owners,
42-
@JsonProperty("members") @Nullable Set<String> members) {
45+
@JsonProperty("members") @Nullable Set<String> members,
46+
@JsonProperty("properties") @Nullable JsonNode properties) {
4347
this.name = validateProjectName(name, "name", false);
4448
this.owners = owners != null ? ImmutableSet.copyOf(owners) : ImmutableSet.of();
4549
this.members = members != null ? ImmutableSet.copyOf(members) : ImmutableSet.of();
50+
this.properties = properties;
4651
}
4752

4853
@JsonProperty
@@ -60,12 +65,19 @@ public Set<String> members() {
6065
return members;
6166
}
6267

68+
@Nullable
69+
@JsonProperty
70+
public JsonNode properties() {
71+
return properties;
72+
}
73+
6374
@Override
6475
public String toString() {
6576
return MoreObjects.toStringHelper(this)
6677
.add("name", name())
6778
.add("owners", owners())
6879
.add("members", members())
80+
.add("properties", properties())
6981
.toString();
7082
}
7183
}

common/src/main/java/com/linecorp/centraldogma/internal/api/v1/CreateRepositoryRequest.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import com.fasterxml.jackson.annotation.JsonCreator;
2525
import com.fasterxml.jackson.annotation.JsonProperty;
26+
import com.fasterxml.jackson.databind.JsonNode;
2627
import com.google.common.base.MoreObjects;
2728

2829
/**
@@ -32,12 +33,16 @@ public class CreateRepositoryRequest {
3233

3334
private final String name;
3435
private final boolean encrypt;
36+
@Nullable
37+
private final JsonNode properties;
3538

3639
@JsonCreator
3740
public CreateRepositoryRequest(@JsonProperty("name") String name,
38-
@JsonProperty("encrypt") @Nullable Boolean encrypt) {
41+
@JsonProperty("encrypt") @Nullable Boolean encrypt,
42+
@JsonProperty("properties") @Nullable JsonNode properties) {
3943
this.name = validateRepositoryName(name, "name");
4044
this.encrypt = firstNonNull(encrypt, false);
45+
this.properties = properties;
4146
}
4247

4348
@JsonProperty
@@ -50,11 +55,18 @@ public boolean encrypt() {
5055
return encrypt;
5156
}
5257

58+
@Nullable
59+
@JsonProperty
60+
public JsonNode properties() {
61+
return properties;
62+
}
63+
5364
@Override
5465
public String toString() {
5566
return MoreObjects.toStringHelper(this)
5667
.add("name", name())
5768
.add("encrypt", encrypt)
69+
.add("properties", properties())
5870
.toString();
5971
}
6072
}

dependencies.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ junit-pioneer = "2.3.0"
4848
jsch = "0.1.55"
4949
# Don't update `json-path` version
5050
json-path = "2.2.0"
51+
json-schema-validator = "1.5.9"
5152
# 3.0.0 requires java 17
5253
json-unit = "2.38.0"
5354
jsoup = "1.22.2" # JSoup is only used for Gradle script.
@@ -286,6 +287,12 @@ module = "com.jayway.jsonpath:json-path"
286287
version.ref = "json-path"
287288
relocations = { from = "com.jayway.jsonpath", to = "com.linecorp.centraldogma.internal.shaded.jsonpath" }
288289

290+
[libraries.json-schema-validator]
291+
module = "com.networknt:json-schema-validator"
292+
version.ref = "json-schema-validator"
293+
# Exclude the differently-versioned jackson-dataformat-yaml edge; :common already provides it.
294+
exclusions = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
295+
289296
[libraries.json-unit]
290297
module = "net.javacrumbs.json-unit:json-unit"
291298
version.ref = "json-unit"

licenses/LICENSE.itu.al20.txt

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
https://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright 2017 Jayway
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
https://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

0 commit comments

Comments
 (0)