diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-03-09 13:39:27 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2020-03-09 13:44:08 +0100 |
| commit | cd2d0bb1e07e7e743f19159682776478fae65d36 (patch) | |
| tree | 0b4f0eeafe2edbaf31f29345cc099f166f3a24ec /config-model/src/test | |
| parent | bbc74ec90bcba32b2de15b3cb5f17b0ed221ca33 (diff) | |
Require 'file' and make 'profile' optional for shared-credentials
- The default profile is 'default'
Diffstat (limited to 'config-model/src/test')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/TelegrafTest.java | 23 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/services.xml | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/TelegrafTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/TelegrafTest.java index 9be94e4198e..f81ad31acb3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/TelegrafTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/TelegrafTest.java @@ -9,6 +9,7 @@ import org.junit.Test; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.CLUSTER_CONFIG_ID; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.hosted; +import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.self_hosted; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.not; @@ -125,4 +126,26 @@ public class TelegrafTest { assertEquals("profile-2", cloudWatch1.profile()); } + @Test + public void profile_named_default_is_used_when_no_profile_is_given_in_shared_credentials() { + String services = String.join("\n", + "<services>", + " <admin version='2.0'>", + " <adminserver hostalias='node1'/>", + " <metrics>", + " <consumer id='cloudwatch-consumer'>", + " <metric id='my-metric'/>", + " <cloudwatch region='us-east-1' namespace='foo' >", + " <shared-credentials file='/path/to/file' />", + " </cloudwatch>", + " </consumer>", + " </metrics>", + " </admin>", + "</services>" + ); + VespaModel model = getModel(services, self_hosted); + TelegrafConfig config = model.getConfig(TelegrafConfig.class, CLUSTER_CONFIG_ID); + assertEquals("default", config.cloudWatch(0).profile()); + } + } diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml index 0c395fedb96..253af585c73 100644 --- a/config-model/src/test/schema-test-files/services.xml +++ b/config-model/src/test/schema-test-files/services.xml @@ -34,7 +34,7 @@ <consumer id="cloudwatch-self-hosted-with-profile"> <metric id="my-custom-metric" /> <cloudwatch region="us-east1" namespace="another-namespace"> - <shared-credentials profile="profile-in-credentials-file" file="/user/.aws/credentials"/> + <shared-credentials file="/user/.aws/credentials" profile="profile-in-credentials-file" /> </cloudwatch> </consumer> |