You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/01/31 00:22:01 UTC

incubator-usergrid git commit: Added additional fixes to have import work while importing files using the new aws key integration

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-import b0b3b94aa -> 65921b152


Added additional fixes to have import work while importing files using the new aws key integration


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/65921b15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/65921b15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/65921b15

Branch: refs/heads/two-dot-o-import
Commit: 65921b1525be7770b22c6fbd55bb86937173c2b0
Parents: b0b3b94
Author: grey <gr...@apigee.com>
Authored: Fri Jan 30 15:21:59 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Fri Jan 30 15:21:59 2015 -0800

----------------------------------------------------------------------
 .../apache/usergrid/management/importer/ImportServiceImpl.java | 2 ++
 .../org/apache/usergrid/management/importer/S3ImportImpl.java  | 6 ++++--
 .../apache/usergrid/management/importer/ImportServiceIT.java   | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/65921b15/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
index 86ef83d..8a9cf16 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
@@ -222,6 +222,8 @@ public class ImportServiceImpl implements ImportService {
         ImportQueueMessage message = new ImportQueueMessage( fileImport.getUuid(), file );
         qm.sendMessage( message );
 
+
+
         //update state of the job to Scheduled
         fileImport.setState(FileImport.State.SCHEDULED);
         rootEm.update(fileImport);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/65921b15/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java
index c7a3752..4a71da1 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java
@@ -17,6 +17,7 @@
 
 package org.apache.usergrid.management.importer;
 
+import com.amazonaws.SDKGlobalConfiguration;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Module;
 import org.jclouds.ContextBuilder;
@@ -63,8 +64,9 @@ public class S3ImportImpl implements S3Import {
         Map<String, Object> storage_info = (Map<String, Object>) properties.get("storage_info");
 
         String bucketName = (String) storage_info.get("bucket_location");
-        String accessId = (String) storage_info.get("s3_access_id");
-        String secretKey = (String) storage_info.get("s3_key");
+        //TODO: have this support the alternate configurations as well
+        String accessId = (String) storage_info.get( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR);
+        String secretKey = (String) storage_info.get(SDKGlobalConfiguration.SECRET_KEY_ENV_VAR);
 
         Properties overrides = new Properties();
         overrides.setProperty("s3" + ".identity", accessId);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/65921b15/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
index 8ad9a1d..0423053 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
@@ -186,8 +186,10 @@ public class ImportServiceIT {
             put( "properties", new HashMap<String, Object>() {{
                 put( "storage_provider", "s3" );
                 put( "storage_info", new HashMap<String, Object>() {{
-                    put( "s3_key", System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ) );
-                    put( "s3_access_id", System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ) );
+                    put( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR,
+                        System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ) );
+                    put( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR,
+                        System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ) );
                     put( "bucket_location", System.getProperty( "bucketName" ) );
                 }});
             }});