From c230ada1baa53d2fee2420f50f6ed726a97357e9 Mon Sep 17 00:00:00 2001 From: Ola Aunrønning Date: Thu, 4 Mar 2021 12:01:57 +0100 Subject: Change config namespace. Update ABI spec --- container-disc/abi-spec.json | 101 +++++++++++++++++++++ .../cloud.config.secret-store.def | 8 -- .../container.jdisc.secretstore.secret-store.def | 8 ++ 3 files changed, 109 insertions(+), 8 deletions(-) delete mode 100644 container-disc/src/main/resources/configdefinitions/cloud.config.secret-store.def create mode 100644 container-disc/src/main/resources/configdefinitions/container.jdisc.secretstore.secret-store.def (limited to 'container-disc') diff --git a/container-disc/abi-spec.json b/container-disc/abi-spec.json index d3ad495ff71..63f6b241750 100644 --- a/container-disc/abi-spec.json +++ b/container-disc/abi-spec.json @@ -59,5 +59,106 @@ "public java.util.List listSecretVersions(java.lang.String)" ], "fields": [] + }, + "com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Builder": { + "superClass": "java.lang.Object", + "interfaces": [ + "com.yahoo.config.ConfigInstance$Builder" + ], + "attributes": [ + "public" + ], + "methods": [ + "public void ()", + "public void (com.yahoo.container.jdisc.secretstore.SecretStoreConfig)", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Builder groups(com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups$Builder)", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Builder groups(java.util.List)", + "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)", + "public final java.lang.String getDefMd5()", + "public final java.lang.String getDefName()", + "public final java.lang.String getDefNamespace()", + "public final boolean getApplyOnRestart()", + "public final void setApplyOnRestart(boolean)", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig build()" + ], + "fields": [ + "public java.util.List groups" + ] + }, + "com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups$Builder": { + "superClass": "java.lang.Object", + "interfaces": [ + "com.yahoo.config.ConfigBuilder" + ], + "attributes": [ + "public" + ], + "methods": [ + "public void ()", + "public void (com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups)", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups$Builder name(java.lang.String)", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups$Builder region(java.lang.String)", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups$Builder awsId(java.lang.String)", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups$Builder role(java.lang.String)", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups$Builder externalId(java.lang.String)", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups build()" + ], + "fields": [] + }, + "com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups": { + "superClass": "com.yahoo.config.InnerNode", + "interfaces": [], + "attributes": [ + "public", + "final" + ], + "methods": [ + "public void (com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups$Builder)", + "public java.lang.String name()", + "public java.lang.String region()", + "public java.lang.String awsId()", + "public java.lang.String role()", + "public java.lang.String externalId()" + ], + "fields": [] + }, + "com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Producer": { + "superClass": "java.lang.Object", + "interfaces": [ + "com.yahoo.config.ConfigInstance$Producer" + ], + "attributes": [ + "public", + "interface", + "abstract" + ], + "methods": [ + "public abstract void getConfig(com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Builder)" + ], + "fields": [] + }, + "com.yahoo.container.jdisc.secretstore.SecretStoreConfig": { + "superClass": "com.yahoo.config.ConfigInstance", + "interfaces": [], + "attributes": [ + "public", + "final" + ], + "methods": [ + "public static java.lang.String getDefMd5()", + "public static java.lang.String getDefName()", + "public static java.lang.String getDefNamespace()", + "public static java.lang.String getDefVersion()", + "public void (com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Builder)", + "public java.util.List groups()", + "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups groups(int)" + ], + "fields": [ + "public static final java.lang.String CONFIG_DEF_MD5", + "public static final java.lang.String CONFIG_DEF_NAME", + "public static final java.lang.String CONFIG_DEF_NAMESPACE", + "public static final java.lang.String CONFIG_DEF_VERSION", + "public static final java.lang.String[] CONFIG_DEF_SCHEMA" + ] } } \ No newline at end of file diff --git a/container-disc/src/main/resources/configdefinitions/cloud.config.secret-store.def b/container-disc/src/main/resources/configdefinitions/cloud.config.secret-store.def deleted file mode 100644 index 9e4789a8597..00000000000 --- a/container-disc/src/main/resources/configdefinitions/cloud.config.secret-store.def +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=cloud.config - -groups[].name string -groups[].region string -groups[].awsId string -groups[].role string -groups[].externalId string \ No newline at end of file diff --git a/container-disc/src/main/resources/configdefinitions/container.jdisc.secretstore.secret-store.def b/container-disc/src/main/resources/configdefinitions/container.jdisc.secretstore.secret-store.def new file mode 100644 index 00000000000..c3edc10c0bc --- /dev/null +++ b/container-disc/src/main/resources/configdefinitions/container.jdisc.secretstore.secret-store.def @@ -0,0 +1,8 @@ +# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=container.jdisc.secretstore + +groups[].name string +groups[].region string +groups[].awsId string +groups[].role string +groups[].externalId string \ No newline at end of file -- cgit v1.2.3