You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/12/01 13:01:33 UTC
[brooklyn-server] branch master updated (23bd7a6 -> 462cb10)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.
from 23bd7a6 Merge pull request #1278 from grkvlt/fix/aws-default-instance-ids
new 4968744 fix tests to be compatible with s3
new d870ba4 wrap aws-s3 so that options are available for guice injection in osgi
new 462cb10 This closes #1279
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
karaf/features/src/main/feature/feature.xml | 3 ++-
.../apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java | 4 ++--
.../mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
[brooklyn-server] 02/03: wrap aws-s3 so that options are available for guice injection in osgi
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit d870ba4a3836f94a4f7d6d64edafd99b29f009a8
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Dec 1 12:58:44 2021 +0000
wrap aws-s3 so that options are available for guice injection in osgi
---
karaf/features/src/main/feature/feature.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 0756a44..f624072 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -374,7 +374,8 @@
<bundle>mvn:org.apache.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.provider/aws-ec2/${jclouds.version}</bundle>
- <bundle>mvn:org.apache.jclouds.provider/aws-s3/${jclouds.version}</bundle>
+ <!-- <bundle>mvn:org.apache.jclouds.provider/aws-s3/${jclouds.version}</bundle> add visibility to options so guice can resolve, below -->
+ <bundle>wrap:mvn:org.apache.jclouds.provider/aws-s3/${jclouds.version}$overwrite=merge&Import-Package=org.jclouds.http.options,*</bundle>
<bundle>mvn:org.apache.jclouds.provider/azureblob/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.provider/azurecompute-arm/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.provider/b2/${jclouds.version}</bundle>
[brooklyn-server] 01/03: fix tests to be compatible with s3
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 496874433997f002de2c7ad9a267e3d770758064
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Dec 1 12:58:20 2021 +0000
fix tests to be compatible with s3
---
.../apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java | 4 ++--
.../mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java
index 6fb2f37..e45c9b6 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java
@@ -65,7 +65,7 @@ public class BlobStoreTest {
@BeforeMethod(alwaysRun=true)
public void setup() {
- testContainerName = CONTAINER_PREFIX+"-"+Identifiers.makeRandomId(8);
+ testContainerName = (CONTAINER_PREFIX+"-"+Identifiers.makeRandomId(8)).toLowerCase();
mgmt = new LocalManagementContextForTests(BrooklynProperties.Factory.newDefault());
location = (JcloudsLocation) mgmt.getLocationRegistry().getLocationManaged(locationSpec);
context = BlobStoreContextFactoryImpl.INSTANCE.newBlobStoreContext(location);
@@ -82,7 +82,7 @@ public class BlobStoreTest {
PageSet<? extends StorageMetadata> ps = context.getBlobStore().list();
assertHasItemNamed(ps, testContainerName);
- Blob b = context.getBlobStore().blobBuilder("my-blob-1").payload(Streams.newInputStreamWithContents("hello world")).build();
+ Blob b = context.getBlobStore().blobBuilder("my-blob-1").payload("hello world").build();
context.getBlobStore().putBlob(testContainerName, b);
Blob b2 = context.getBlobStore().getBlob(testContainerName, "my-blob-1");
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java
index 63020ca..9ecac6b 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java
@@ -82,14 +82,14 @@ public class JcloudsBlobStoreBasedObjectStoreTest {
@Test(groups={"Live", "Live-sanity"})
public void testJclouds() throws Exception {
- doTestWithStore( newObjectStore(BlobStoreTest.PERSIST_TO_OBJECT_STORE_FOR_TEST_SPEC,
- BlobStoreTest.CONTAINER_PREFIX+"-"+Identifiers.makeRandomId(4)) );
+ doTestWithStore( newObjectStore(BlobStoreTest.PERSIST_TO_OBJECT_STORE_FOR_TEST_SPEC,
+ (BlobStoreTest.CONTAINER_PREFIX+"-"+Identifiers.makeRandomId(4)).toLowerCase()) );
}
@Test(groups={"Live", "Live-sanity"})
public void testJcloudsWithSubPathInContainerName() throws Exception {
doTestWithStore( newObjectStore(BlobStoreTest.PERSIST_TO_OBJECT_STORE_FOR_TEST_SPEC,
- BlobStoreTest.CONTAINER_PREFIX+"-"+Identifiers.makeRandomId(4)+"/subpath1/subpath2") );
+ BlobStoreTest.CONTAINER_PREFIX+"-"+Identifiers.makeRandomId(4).toLowerCase()+"/subpath1/subpath2") );
}
protected void doTestWithStore(PersistenceObjectStore objectStore) {
[brooklyn-server] 03/03: This closes #1279
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 462cb1052f694ccb9a465c17512b8a48bcfc04e9
Merge: 23bd7a6 d870ba4
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Dec 1 13:01:28 2021 +0000
This closes #1279
karaf/features/src/main/feature/feature.xml | 3 ++-
.../apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java | 4 ++--
.../mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)