diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-07-04 19:36:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 19:36:52 +0200 |
| commit | b21d7c5890ca33700a35c4f7e3f1b8187a64645c (patch) | |
| tree | 771d6710fd1296ca3767e6b2349acca1eae530bd | |
| parent | aa6eb29bf11b4479e1c46ad7c337daf76f82e3c5 (diff) | |
| parent | f5086a25d3fef0b00281cc806f326782c361e442 (diff) | |
Merge pull request #27631 from vespa-engine/jonmv/vespa-athenz-gcp
Add "gcpProject" to AthenzDomainMeta
2 files changed, 2 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java index 94ed28778d7..b1edc189295 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java @@ -145,7 +145,7 @@ public class ZmsClientMock implements ZmsClient { .map(d -> d.attributes) .map(attrs -> { if (attrs.containsKey("account")) { - return new AthenzDomainMeta((String)attrs.get("account"), domain.getName()); + return new AthenzDomainMeta((String) attrs.get("account"), (String) attrs.get("gcpProject"), domain.getName()); } return null; }) diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzDomainMeta.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzDomainMeta.java index 7808a689982..c0f4f8958bf 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzDomainMeta.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzDomainMeta.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public record AthenzDomainMeta( @JsonProperty("account") String account, + @JsonProperty("gcpProject") String gcpProject, @JsonProperty("name") String name ) { } |