Github user ahgittin commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/194#discussion_r66627553
--- Diff:
camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JcloudsLocationExternalConfigYamlTest.java
---
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.camp.brooklyn;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.File;
+import java.io.StringReader;
+
+import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.location.Location;
+import
org.apache.brooklyn.camp.brooklyn.ExternalConfigYamlTest.MyExternalConfigSupplier;
+import
org.apache.brooklyn.camp.brooklyn.ExternalConfigYamlTest.MyExternalConfigSupplierWithoutMapArg;
+import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.core.config.ConfigKeys;
+import org.apache.brooklyn.core.entity.StartableApplication;
+import org.apache.brooklyn.core.internal.BrooklynProperties;
+import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
+import org.apache.brooklyn.core.mgmt.rebind.RebindTestUtils;
+import org.apache.brooklyn.core.objs.BrooklynObjectInternal;
+import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess;
+import org.apache.brooklyn.location.jclouds.JcloudsLocation;
+import org.apache.brooklyn.util.core.internal.ssh.SshTool;
+import org.apache.brooklyn.util.core.task.DeferredSupplier;
+import org.apache.brooklyn.util.guava.Maybe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.Iterables;
+
+// also see ExternalConfigYamlTest
+public class JcloudsLocationExternalConfigYamlTest extends
AbstractYamlRebindTest {
+
+ private static final Logger log =
LoggerFactory.getLogger(ExternalConfigYamlTest.class);
+
+ private static final ConfigKey<String> MY_CONFIG_KEY =
ConfigKeys.newStringConfigKey("my.config.key");
+
+ /** @return A started management context */
+ protected LocalManagementContext createOrigManagementContext() {
+ return RebindTestUtils.managementContextBuilder(mementoDir,
classLoader)
+ .properties(externalProps())
+ .persistPeriodMillis(getPersistPeriodMillis())
+ .forLive(useLiveManagementContext())
+ .emptyCatalog(useEmptyCatalog())
+ .buildStarted();
+ }
+
+ /** @return An unstarted management context using the specified
mementoDir (or default if null) */
+ protected LocalManagementContext createNewManagementContext(File
mementoDir) {
+ if (mementoDir==null) mementoDir = this.mementoDir;
+ return RebindTestUtils.managementContextBuilder(mementoDir,
classLoader)
+ .properties(externalProps())
+ .forLive(useLiveManagementContext())
+ .emptyCatalog(useEmptyCatalog())
+ .buildUnstarted();
+ }
+
+ private BrooklynProperties externalProps() {
+ BrooklynProperties props = BrooklynProperties.Factory.newDefault();
+ props.put("brooklyn.external.myprovider",
MyExternalConfigSupplier.class.getName());
+ props.put("brooklyn.external.myprovider.mykey", "myval");
+ props.put("brooklyn.external.myproviderWithoutMapArg",
MyExternalConfigSupplierWithoutMapArg.class.getName());
+ return props;
+ }
+
+ @Test(groups="Live")
+ public void testJcloudsInheritanceAndPasswordSecret() throws Exception
{
+ String yaml = Joiner.on("\n").join(
+ "services:",
+ "- type: "+EmptySoftwareProcess.class.getName(),
+ "location:",
+ " jclouds:aws-ec2:",
+ " password: $brooklyn:external(\"myprovider\",
\"mykey\")",
+ " my.config.key: $brooklyn:external(\"myprovider\",
\"mykey\")");
+
+ origApp = (StartableApplication) createAndStartApplication(new
StringReader(yaml));
+
+ Entity entity = Iterables.getOnlyElement( origApp.getChildren() );
+ Location l = Iterables.getOnlyElement( entity.getLocations() );
+ log.info("Location: "+l);
+ assertEquals(l.config().get(MY_CONFIG_KEY), "myval");
+
+ Maybe<Object> rawConfig =
((BrooklynObjectInternal.ConfigurationSupportInternal)l.config()).getRaw(MY_CONFIG_KEY);
+ log.info("Raw config: "+rawConfig);
+ Assert.assertTrue(rawConfig.isPresentAndNonNull());
+ Assert.assertTrue(rawConfig.get() instanceof DeferredSupplier,
"Expected deferred raw value; got "+rawConfig.get());
+
+ rawConfig =
((BrooklynObjectInternal.ConfigurationSupportInternal)l.config()).getRaw(SshTool.PROP_PASSWORD);
+ log.info("Raw config password: "+rawConfig);
+ Assert.assertTrue(rawConfig.isPresentAndNonNull());
+ Assert.assertTrue(rawConfig.get() instanceof DeferredSupplier,
"Expected deferred raw value; got "+rawConfig.get());
+ }
+
+ @Test(groups="Live")
+ public void testProvisioningPropertyInheritance() throws Exception {
+ String yaml = Joiner.on("\n").join(
+ "services:",
+ "- type: "+EmptySoftwareProcess.class.getName(),
+ " provisioning.properties:",
+ " password: $brooklyn:external(\"myprovider\",
\"mykey\")",
+ // note that these 2 do not get transferred -- see below
+ " simple: 42",
+ " my.config.key: $brooklyn:external(\"myprovider\",
\"mykey\")",
+ "location: aws-ec2");
+
+ origApp = (StartableApplication) createAndStartApplication(new
StringReader(yaml));
+
+ Entity entity = Iterables.getOnlyElement( origApp.getChildren() );
+ Location l = Iterables.getOnlyElement( entity.getLocations() );
+ log.info("Location: "+l);
+ assertEquals(l.config().get(JcloudsLocation.PASSWORD), "myval");
+
+ Maybe<Object> rawConfig =
((BrooklynObjectInternal.ConfigurationSupportInternal)l.config()).getRaw(ConfigKeys.newStringConfigKey("password"));
+ log.info("Raw config password: "+rawConfig);
+ Assert.assertTrue(rawConfig.isPresentAndNonNull());
+ Assert.assertTrue(rawConfig.get() instanceof DeferredSupplier,
"Expected deferred raw value; got "+rawConfig.get());
+
+ // these are null as only recognised provisioning properties are
transmitted by jclouds
--- End diff --
this is an ugly inconsistency between how jclouds handles `obtain(flags)`
and others (eg localhost, see the test in the other class) which i had never
noticed
@nakomis @aledsage @andreaturli @neykov wdyt, should unrecognised flags
passed in `obtain(...)` *(a)* be passed through and set on the provisioned
machine location, as in localhost, or *(b)* be dropped (optionally with warning
or failure), as in jclouds ?
(not necessarily for this PR, this is just where we've noticed it)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
