summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-07-04 17:12:04 +0200
committerjonmv <venstad@gmail.com>2023-07-04 17:12:04 +0200
commitf5086a25d3fef0b00281cc806f326782c361e442 (patch)
tree0a660e7d521d40d8e12218d1e6087c80936d87c6
parentb3abb357a1d64c19f9be1efeb60b43da244c4391 (diff)
Add "gcpProject" to AthenzDomainMeta
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java2
-rw-r--r--vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzDomainMeta.java1
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
) {
}