Merge pull request Netflix#265 from claymccoy/sdbPrBuildFAilures

Trying to fix errors in Pull Request build
michaelnflx · Mar 6, 2013 · 88e9d9d · 88e9d9d
2 parents 30d658f + 12f815c
commit 88e9d9d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/grails-app/services/com/netflix/asgard/ApplicationService.groovy b/grails-app/services/com/netflix/asgard/ApplicationService.groovy
@@ -54,7 +54,7 @@ class ApplicationService implements CacheInitializer, InitializingBean {
         domainName = configService.applicationsDomain
 
         // Applications are stored only in the default region, so no multi region support needed here.
-        simpleDbClient = awsClientService.create(AmazonSimpleDB)
+        simpleDbClient = simpleDbClient ?: awsClientService.create(AmazonSimpleDB)
     }
 
     void initializeCaches() {

diff --git a/grails-app/services/com/netflix/asgard/AwsClientService.groovy b/grails-app/services/com/netflix/asgard/AwsClientService.groovy
@@ -75,6 +75,10 @@ class AwsClientService implements InitializingBean {
 
     public <T> T create(Class<T> interfaceType) {
         Class implementationType = interfaceSimpleNamesToAwsClientClasses[interfaceType.simpleName]
+        createImpl(implementationType)
+    }
+
+    public <T> T createImpl(Class<T> implementationType) {
         implementationType.newInstance(secretService.awsCredentials, clientConfiguration) as T
     }
 

diff --git a/src/groovy/com/netflix/asgard/mock/Mocks.groovy b/src/groovy/com/netflix/asgard/mock/Mocks.groovy
@@ -211,6 +211,7 @@ class Mocks {
             applicationService.grailsApplication = grailsApplication()
             applicationService.configService = configService()
             applicationService.awsClientService = awsClientService()
+            applicationService.simpleDbClient = applicationService.awsClientService.createImpl(MockAmazonSimpleDBClient)
 
             List<String> names =
                     ['abcache', 'api', 'aws_stats', 'cryptex', 'helloworld', 'ntsuiboot', 'videometadata'].asImmutable()

diff --git a/test/unit/com/netflix/asgard/SecurityCreateCommandTests.groovy b/test/unit/com/netflix/asgard/SecurityCreateCommandTests.groovy
@@ -30,6 +30,7 @@ class SecurityCreateCommandTests {
     void setUp() {
         TestUtils.setUpMockRequest()
         MockUtils.prepareForConstraintsTests(SecurityCreateCommand)
+        Mocks.createDynamicMethods()
         appService = Mocks.applicationService()
     }