Merge pull request #15 from statisticsnorway/update-schema

Fix wrong required for github in team definition
statisticsnorway · Jan 24, 2024 · 0c0fc93 · 0c0fc93
2 parents f06269a + d349f96
commit 0c0fc93
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/generated/java/dapla-kuben-resource-model/src/main/java/no/ssb/dapla/kuben/v1/Github.java b/generated/java/dapla-kuben-resource-model/src/main/java/no/ssb/dapla/kuben/v1/Github.java
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
@@ -21,8 +22,14 @@
 public class Github implements Serializable
 {
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("iac_repo")
     @Valid
+    @NotNull
     private IacRepo iacRepo;
     @JsonIgnore
     @Valid
@@ -45,11 +52,21 @@ public static Github.GithubBuilderBase builder() {
         return new Github.GithubBuilder();
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("iac_repo")
     public IacRepo getIacRepo() {
         return iacRepo;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("iac_repo")
     public void setIacRepo(IacRepo iacRepo) {
         this.iacRepo = iacRepo;

diff --git a/src/v1/additional-team-info.schema.json b/src/v1/additional-team-info.schema.json
@@ -9,7 +9,9 @@
       "version": "kuben/v1",
       "kind": "AdditionalTeamInfo",
       "metadata": {
-        "name": "my-name"
+        "name": "my-name",
+        "team_name": "dapla-platform",
+        "visibility": "PUBLIC"
       },
       "spec": {
         "my-field": "123",

diff --git a/src/v1/kuben-team-definition.schema.json b/src/v1/kuben-team-definition.schema.json
@@ -53,7 +53,7 @@
     "github": {
       "type": "object",
       "required": [
-        "name"
+        "iac_repo"
       ],
       "properties": {
         "iac_repo": {