adapt Mock clients constructor to the fact that AwsClient may now hav…

…e a ClientConfiguration (triggered by need to have a HTTP proxy)
Netflix · Sep 18, 2012 · bb39b25 · bb39b25
1 parent 799a08d
commit bb39b25
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 18 deletions.
diff --git a/src/groovy/com/netflix/asgard/mock/MockAmazonAutoScalingClient.groovy b/src/groovy/com/netflix/asgard/mock/MockAmazonAutoScalingClient.groovy
@@ -62,6 +62,7 @@ import com.amazonaws.services.autoscaling.model.TerminateInstanceInAutoScalingGr
 import com.amazonaws.services.autoscaling.model.UpdateAutoScalingGroupRequest
 import org.codehaus.groovy.grails.web.json.JSONArray
 import org.joda.time.format.ISODateTimeFormat
+import com.amazonaws.ClientConfiguration
 
 class MockAmazonAutoScalingClient extends AmazonAutoScalingClient {
 
@@ -103,8 +104,8 @@ class MockAmazonAutoScalingClient extends AmazonAutoScalingClient {
         }
     }
 
-    MockAmazonAutoScalingClient(BasicAWSCredentials awsCredentials) {
-        super(awsCredentials)
+    MockAmazonAutoScalingClient(BasicAWSCredentials awsCredentials, ClientConfiguration clientConfiguration) {
+        super(awsCredentials as BasicAWSCredentials, clientConfiguration)
         mockAsgs = loadMockAsgs()
         mockLaunchConfigs = loadMockLaunchConfigs()
     }

diff --git a/src/groovy/com/netflix/asgard/mock/MockAmazonCloudWatchClient.groovy b/src/groovy/com/netflix/asgard/mock/MockAmazonCloudWatchClient.groovy
@@ -22,6 +22,7 @@ import com.amazonaws.services.cloudwatch.model.DescribeAlarmsResult
 import com.amazonaws.services.cloudwatch.model.ListMetricsRequest
 import com.amazonaws.services.cloudwatch.model.ListMetricsResult
 import com.amazonaws.services.cloudwatch.model.MetricAlarm
+import com.amazonaws.ClientConfiguration
 
 class MockAmazonCloudWatchClient extends AmazonCloudWatchClient {
 
@@ -31,8 +32,8 @@ class MockAmazonCloudWatchClient extends AmazonCloudWatchClient {
         [new MetricAlarm().withAlarmName('goofy')]
     }
 
-    MockAmazonCloudWatchClient(BasicAWSCredentials awsCredentials) {
-        super(awsCredentials)
+    MockAmazonCloudWatchClient(BasicAWSCredentials awsCredentials, ClientConfiguration clientConfiguration) {
+        super(awsCredentials as BasicAWSCredentials, clientConfiguration)
         mockAlarms = loadMockAlarms()
     }
 

diff --git a/src/groovy/com/netflix/asgard/mock/MockAmazonEC2Client.groovy b/src/groovy/com/netflix/asgard/mock/MockAmazonEC2Client.groovy
@@ -192,6 +192,7 @@ import com.amazonaws.services.ec2.model.Volume
 import com.amazonaws.services.ec2.model.VolumeAttachment
 import org.codehaus.groovy.grails.web.json.JSONArray
 import org.joda.time.format.ISODateTimeFormat
+import com.amazonaws.ClientConfiguration
 
 class MockAmazonEC2Client extends AmazonEC2Client {
 
@@ -322,8 +323,8 @@ class MockAmazonEC2Client extends AmazonEC2Client {
         }
     }
 
-    MockAmazonEC2Client(BasicAWSCredentials awsCredentials) {
-        super(awsCredentials)
+    MockAmazonEC2Client(BasicAWSCredentials awsCredentials, ClientConfiguration clientConfiguration) {
+        super(awsCredentials as BasicAWSCredentials, clientConfiguration)
         mockImages = loadMockImages()
         mockInstances = loadMockInstances()
         mockSpotInstanceRequests = loadMockSpotInstanceRequests()

diff --git a/src/groovy/com/netflix/asgard/mock/MockAmazonElasticLoadBalancingClient.groovy b/src/groovy/com/netflix/asgard/mock/MockAmazonElasticLoadBalancingClient.groovy
@@ -56,6 +56,7 @@ import com.amazonaws.services.elasticloadbalancing.model.SetLoadBalancerPolicies
 import com.amazonaws.services.elasticloadbalancing.model.SourceSecurityGroup
 import org.codehaus.groovy.grails.web.json.JSONArray
 import org.joda.time.format.ISODateTimeFormat
+import com.amazonaws.ClientConfiguration
 
 class MockAmazonElasticLoadBalancingClient extends AmazonElasticLoadBalancingClient {
 
@@ -90,8 +91,8 @@ class MockAmazonElasticLoadBalancingClient extends AmazonElasticLoadBalancingCli
         }
     }
 
-    MockAmazonElasticLoadBalancingClient(BasicAWSCredentials awsCredentials) {
-        super(awsCredentials)
+    MockAmazonElasticLoadBalancingClient(BasicAWSCredentials awsCredentials, ClientConfiguration clientConfiguration) {
+        super(awsCredentials as BasicAWSCredentials, clientConfiguration)
         mockLoadBalancers = loadMockLoadBalancers()
     }
 

diff --git a/src/groovy/com/netflix/asgard/mock/MockAmazonRDSClient.groovy b/src/groovy/com/netflix/asgard/mock/MockAmazonRDSClient.groovy
@@ -65,6 +65,7 @@ import com.amazonaws.services.rds.model.RestoreDBInstanceFromDBSnapshotRequest
 import com.amazonaws.services.rds.model.RestoreDBInstanceToPointInTimeRequest
 import com.amazonaws.services.rds.model.RevokeDBSecurityGroupIngressRequest
 import com.netflix.asgard.BeanState
+import com.amazonaws.ClientConfiguration
 
 class MockAmazonRDSClient extends AmazonRDSClient {
 
@@ -84,8 +85,8 @@ class MockAmazonRDSClient extends AmazonRDSClient {
         [new DBSnapshot().withDBSnapshotIdentifier('mickeymouse')]
     }
 
-    MockAmazonRDSClient(BasicAWSCredentials awsCredentials) {
-        super(awsCredentials)
+    MockAmazonRDSClient(BasicAWSCredentials awsCredentials, ClientConfiguration clientConfiguration) {
+        super(awsCredentials as BasicAWSCredentials, clientConfiguration)
         mockDbInstances = loadMockDbInstances()
         mockDbSecurityGroups = loadMockDbSecurityGroups()
         mockDbSnapshots = loadMockDbSnapshots()

diff --git a/src/groovy/com/netflix/asgard/mock/MockAmazonS3Client.groovy b/src/groovy/com/netflix/asgard/mock/MockAmazonS3Client.groovy
@@ -17,11 +17,12 @@ package com.netflix.asgard.mock
 
 import com.amazonaws.auth.BasicAWSCredentials
 import com.amazonaws.services.s3.AmazonS3Client
+import com.amazonaws.ClientConfiguration
 
 class MockAmazonS3Client extends AmazonS3Client {
 
-    MockAmazonS3Client(BasicAWSCredentials awsCredentials) {
-        super(awsCredentials)
+    MockAmazonS3Client(BasicAWSCredentials awsCredentials, ClientConfiguration clientConfiguration) {
+        super(awsCredentials as BasicAWSCredentials, clientConfiguration)
     }
 
     void setEndpoint(String endpoint) {

diff --git a/src/groovy/com/netflix/asgard/mock/MockAmazonSimpleDBClient.groovy b/src/groovy/com/netflix/asgard/mock/MockAmazonSimpleDBClient.groovy
@@ -38,6 +38,7 @@ import com.amazonaws.services.simpledb.model.SelectResult
 import com.amazonaws.services.simpledb.model.UpdateCondition
 import org.codehaus.groovy.grails.web.json.JSONArray
 import org.joda.time.format.ISODateTimeFormat
+import com.amazonaws.ClientConfiguration
 
 class MockAmazonSimpleDBClient extends AmazonSimpleDBClient {
 
@@ -88,8 +89,8 @@ class MockAmazonSimpleDBClient extends AmazonSimpleDBClient {
         )]
     }
 
-    MockAmazonSimpleDBClient(BasicAWSCredentials awsCredentials) {
-        super(awsCredentials)
+    MockAmazonSimpleDBClient(BasicAWSCredentials awsCredentials, ClientConfiguration clientConfiguration) {
+        super(awsCredentials as BasicAWSCredentials, clientConfiguration)
         mockAppItems = loadMockAppItems()
         mockDomains = loadMockDomains()
     }

diff --git a/src/groovy/com/netflix/asgard/mock/MockAmazonSnsClient.groovy b/src/groovy/com/netflix/asgard/mock/MockAmazonSnsClient.groovy
@@ -27,6 +27,7 @@ import com.amazonaws.services.sns.model.ListTopicsRequest
 import com.amazonaws.services.sns.model.ListTopicsResult
 import com.amazonaws.services.sns.model.Topic
 import com.netflix.asgard.model.TopicData
+import com.amazonaws.ClientConfiguration
 
 class MockAmazonSnsClient extends AmazonSNSClient {
 
@@ -36,8 +37,8 @@ class MockAmazonSnsClient extends AmazonSNSClient {
         [new Topic().withTopicArn('arn:aws:sns:us-east-1:179000000000:abadmin-testConformity-Report')]
     }
 
-    MockAmazonSnsClient(BasicAWSCredentials awsCredentials) {
-        super(awsCredentials)
+    MockAmazonSnsClient(BasicAWSCredentials awsCredentials, ClientConfiguration clientConfiguration) {
+        super(awsCredentials as BasicAWSCredentials, clientConfiguration)
         mockTopics = loadMockTopics()
     }
 

diff --git a/src/groovy/com/netflix/asgard/mock/MockAmazonSqsClient.groovy b/src/groovy/com/netflix/asgard/mock/MockAmazonSqsClient.groovy
@@ -30,6 +30,7 @@ import com.amazonaws.services.sqs.model.ListQueuesRequest
 import com.amazonaws.services.sqs.model.ListQueuesResult
 import com.netflix.asgard.Region
 import com.netflix.asgard.model.SimpleQueue
+import com.amazonaws.ClientConfiguration
 
 class MockAmazonSqsClient extends AmazonSQSClient {
 
@@ -48,8 +49,8 @@ class MockAmazonSqsClient extends AmazonSQSClient {
         ])]
     }
 
-    MockAmazonSqsClient(BasicAWSCredentials awsCredentials) {
-        super(awsCredentials)
+    MockAmazonSqsClient(BasicAWSCredentials awsCredentials, ClientConfiguration clientConfiguration) {
+        super(awsCredentials as BasicAWSCredentials, clientConfiguration)
         mockQueues = loadMockQueues()
     }
 

diff --git a/src/groovy/com/netflix/asgard/mock/Mocks.groovy b/src/groovy/com/netflix/asgard/mock/Mocks.groovy
@@ -333,6 +333,7 @@ class Mocks {
             awsClientService = new AwsClientService()
             awsClientService.grailsApplication = grailsApplication()
             awsClientService.secretService = new SecretService()
+            awsClientService.configService = configService()
             awsClientService.afterPropertiesSet()
         }
         awsClientService