Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-217: EC2: Do not encode form parameters. 

EC2 tests should not pre-encode form parameters when constructing the
expected HTTP responses.
This commit is contained in:
Timur Alperovich 2015-08-25 21:19:25 -07:00
parent b87ca1b33a
commit d70127f126
13 changed files with 98 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java
View File

@ -98,7 +98,6 @@ import org.jclouds.ec2.domain.RunningInstance;
import org.jclouds.ec2.domain.Tag;
import org.jclouds.ec2.util.TagFilterBuilder;
import org.jclouds.scriptbuilder.functions.InitAdminAccess;
import org.jclouds.util.Strings2;
@Singleton
public class EC2ComputeService extends BaseComputeService {
@ -234,8 +233,7 @@ public class EC2ComputeService extends BaseComputeService {
void deleteKeyPair(String region, String group) {
for (KeyPair keyPair : client.getKeyPairApi().get().describeKeyPairsInRegionWithFilter(region,
ImmutableMultimap.<String, String>builder()
.put("key-name", Strings2.urlEncode(
String.format("jclouds#%s#*", group).replace('#', delimiter)))
.put("key-name", String.format("jclouds#%s#*", group).replace('#', delimiter))
.build())) {
String keyName = keyPair.getKeyName();
Predicate<String> keyNameMatcher = namingConvention.create().containsGroup(group);

4
apis/ec2/src/test/java/org/jclouds/ec2/features/AMIApiExpectTest.java
View File

@ -38,10 +38,10 @@ public class AMIApiExpectTest extends BaseEC2ApiExpectTest<EC2Api> {
.addFormParam("Action", "DescribeImages")
.addFormParam("Filter.1.Name", "owner-id")
.addFormParam("Filter.1.Value.1", "206029621532")
.addFormParam("Signature", "BxOCrCYJujtaUqSPagRvv1ki76veVBiKK3yWHvRWgR0%3D")
.addFormParam("Signature", "BxOCrCYJujtaUqSPagRvv1ki76veVBiKK3yWHvRWgR0=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2012-04-16T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2012-04-16T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();

56
apis/ec2/src/test/java/org/jclouds/ec2/features/AMIApiTest.java
View File

@ -52,10 +52,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("Action", "CreateImage")
.addFormParam("InstanceId", "instanceId")
.addFormParam("Name", "name")
.addFormParam("Signature", "MuMtOMs697BLVks2RUZUNeLdVCo6NXPHuDhh0nmNtvc%3D")
.addFormParam("Signature", "MuMtOMs697BLVks2RUZUNeLdVCo6NXPHuDhh0nmNtvc=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -85,10 +85,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("InstanceId", "instanceId")
.addFormParam("Name", "name")
.addFormParam("NoReboot", "true")
.addFormParam("Signature", "8SgbaWihxOICMXDLvwk3ahy/99nhZvTvbno%2B8dMyvJg%3D")
.addFormParam("Signature", "8SgbaWihxOICMXDLvwk3ahy/99nhZvTvbno+8dMyvJg=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -116,10 +116,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.endpoint("https://ec2.us-east-1.amazonaws.com/")
.addHeader("Host", "ec2.us-east-1.amazonaws.com")
.addFormParam("Action", "DescribeImages")
.addFormParam("Signature", "hQxNAaRVX6OvXV0IKgx1vV0FoNbRyuHQ2fhRhaPJnS8%3D")
.addFormParam("Signature", "hQxNAaRVX6OvXV0IKgx1vV0FoNbRyuHQ2fhRhaPJnS8=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -151,10 +151,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("ImageId.2", "2")
.addFormParam("Owner.1", "fred")
.addFormParam("Owner.2", "nancy")
.addFormParam("Signature", "cIft3g1fwMu52NgB0En9NtHyXjVhmeSx7TBP7YR%2BTvI%3D")
.addFormParam("Signature", "cIft3g1fwMu52NgB0En9NtHyXjVhmeSx7TBP7YR+TvI=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -183,10 +183,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addHeader("Host", "ec2.us-east-1.amazonaws.com")
.addFormParam("Action", "DeregisterImage")
.addFormParam("ImageId", "imageId")
.addFormParam("Signature", "tm6nGoPPJh7xt5TSdV5Ov0DJvcGTAW%2BYSfXL7j%2BTkOA%3D")
.addFormParam("Signature", "tm6nGoPPJh7xt5TSdV5Ov0DJvcGTAW+YSfXL7j+TkOA=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -214,10 +214,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("Action", "RegisterImage")
.addFormParam("ImageLocation", "pathToManifest")
.addFormParam("Name", "name")
.addFormParam("Signature", "Ie7k7w4Bdki3uCGeSFGdJ5EKrp/ohkHvWwivbIaVLEM%3D")
.addFormParam("Signature", "Ie7k7w4Bdki3uCGeSFGdJ5EKrp/ohkHvWwivbIaVLEM=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -246,10 +246,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("Description", "description")
.addFormParam("ImageLocation", "pathToManifest")
.addFormParam("Name", "name")
.addFormParam("Signature", "ilWV1eAWW6kTK/jHliQ%2BIkzJR4DRNy4ye%2BSKtnUjjDs%3D")
.addFormParam("Signature", "ilWV1eAWW6kTK/jHliQ+IkzJR4DRNy4ye+SKtnUjjDs=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -281,10 +281,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("BlockDeviceMapping.0.Ebs.SnapshotId", "snapshotId")
.addFormParam("Name", "imageName")
.addFormParam("RootDeviceName", "/dev/sda1")
.addFormParam("Signature", "ZbZcY6uwxPbD65jFmiNZXoWeHY/2zqRuGuDmTfkt84A%3D")
.addFormParam("Signature", "ZbZcY6uwxPbD65jFmiNZXoWeHY/2zqRuGuDmTfkt84A=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -322,10 +322,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("Description", "description")
.addFormParam("Name", "imageName")
.addFormParam("RootDeviceName", "/dev/sda1")
.addFormParam("Signature", "DrNujyZMGrKvuw73A7ObFTThXvc/MRfNqjvIy8gey5g%3D")
.addFormParam("Signature", "DrNujyZMGrKvuw73A7ObFTThXvc/MRfNqjvIy8gey5g=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -356,10 +356,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("Action", "DescribeImageAttribute")
.addFormParam("Attribute", "blockDeviceMapping")
.addFormParam("ImageId", "imageId")
.addFormParam("Signature", "MJCIc1roG%2BnIWxRSUqV9KP9Wc4AWuuiNkxeDSih5/mI%3D")
.addFormParam("Signature", "MJCIc1roG+nIWxRSUqV9KP9Wc4AWuuiNkxeDSih5/mI=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -388,10 +388,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("Action", "DescribeImageAttribute")
.addFormParam("Attribute", "launchPermission")
.addFormParam("ImageId", "imageId")
.addFormParam("Signature", "iN7JbsAhM1NAES3o%2BOw8BaaFJ%2B1g9imBjcU4mFCyrxM%3D")
.addFormParam("Signature", "iN7JbsAhM1NAES3o+Ow8BaaFJ+1g9imBjcU4mFCyrxM=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -420,10 +420,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("Attribute", "launchPermission")
.addFormParam("ImageId", "imageId")
.addFormParam("OperationType", "add")
.addFormParam("Signature", "ZuMuzW/iQDRURhUJaBzvoAdNJrE454y6X0jM24lcxxk%3D")
.addFormParam("Signature", "ZuMuzW/iQDRURhUJaBzvoAdNJrE454y6X0jM24lcxxk=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("UserGroup.1", "all")
.addFormParam("UserId.1", "bob")
.addFormParam("UserId.2", "sue")
@ -457,10 +457,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("Attribute", "launchPermission")
.addFormParam("ImageId", "imageId")
.addFormParam("OperationType", "remove")
.addFormParam("Signature", "HreSEawbVaUp/UMicCJbhrx%2BmoX01f2pEphJCPz8/5g%3D")
.addFormParam("Signature", "HreSEawbVaUp/UMicCJbhrx+moX01f2pEphJCPz8/5g=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("UserGroup.1", "all")
.addFormParam("UserId.1", "bob")
.addFormParam("UserId.2", "sue")
@ -492,10 +492,10 @@ public class AMIApiTest extends BaseEC2ApiTest<AMIApi> {
.addFormParam("Action", "ResetImageAttribute")
.addFormParam("Attribute", "launchPermission")
.addFormParam("ImageId", "imageId")
.addFormParam("Signature", "fVCR9aGYvNX/Jt1/uqBGcUQRLrHwxtcvmNYKzpul1P4%3D")
.addFormParam("Signature", "fVCR9aGYvNX/Jt1/uqBGcUQRLrHwxtcvmNYKzpul1P4=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();

19
apis/ec2/src/test/java/org/jclouds/ec2/features/EC2ElasticBlockStoreApiExpectTest.java
View File

@ -57,7 +57,16 @@ public class EC2ElasticBlockStoreApiExpectTest extends BaseEC2ApiExpectTest<EC2A
.method("POST")
.endpoint("https://ec2.us-east-1.amazonaws.com/")
.addHeader("Host", "ec2.us-east-1.amazonaws.com")
.payload(payloadFromStringWithContentType("Action=CreateVolume&AvailabilityZone=us-east-1a&Signature=NCu8HU8u0A385rTgj%2BN5lq606jkc1eu88jof9yAxb6s%3D&SignatureMethod=HmacSHA256&SignatureVersion=2&Size=4&Timestamp=2012-04-16T15%3A54%3A08.897Z&Version=2010-08-31&AWSAccessKeyId=identity", "application/x-www-form-urlencoded")).build(),
.payload(payloadFromStringWithContentType("Action=CreateVolume" +
"&AvailabilityZone=us-east-1a" +
"&Signature=NCu8HU8u0A385rTgj%2BN5lq606jkc1eu88jof9yAxb6s%3D" +
"&SignatureMethod=HmacSHA256" +
"&SignatureVersion=2" +
"&Size=4" +
"&Timestamp=2012-04-16T15%3A54%3A08.897Z" +
"&Version=2010-08-31" +
"&AWSAccessKeyId=identity",
"application/x-www-form-urlencoded")).build(),
HttpResponse.builder()
.statusCode(200)
.payload(payloadFromResource("/created_volume.xml")).build());
@ -129,10 +138,10 @@ public class EC2ElasticBlockStoreApiExpectTest extends BaseEC2ApiExpectTest<EC2A
.addFormParam("Action", "DescribeVolumes")
.addFormParam("Filter.1.Name", "snapshot-id")
.addFormParam("Filter.1.Value.1", "snap-536d1b3a")
.addFormParam("Signature", "7g2ySW39nIVfxtIbuVttUBom7sssmQknxX/9SThkm2Y%3D")
.addFormParam("Signature", "7g2ySW39nIVfxtIbuVttUBom7sssmQknxX/9SThkm2Y=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2012-04-16T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2012-04-16T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -169,10 +178,10 @@ public class EC2ElasticBlockStoreApiExpectTest extends BaseEC2ApiExpectTest<EC2A
.addFormParam("Action", "DescribeSnapshots")
.addFormParam("Filter.1.Name", "volume-id")
.addFormParam("Filter.1.Value.1", "4d826724")
.addFormParam("Signature", "vT7R4YmfQJPNLSojXEMY1qcErMh0OzrOTYxbGYSZ4Uw%3D")
.addFormParam("Signature", "vT7R4YmfQJPNLSojXEMY1qcErMh0OzrOTYxbGYSZ4Uw=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2012-04-16T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2012-04-16T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();

24
apis/ec2/src/test/java/org/jclouds/ec2/features/ElasticBlockStoreApiTest.java
View File

@ -68,10 +68,10 @@ public class ElasticBlockStoreApiTest extends BaseEC2ApiTest<ElasticBlockStoreAp
.endpoint("https://ec2.us-east-1.amazonaws.com/")
.addHeader("Host", "ec2.us-east-1.amazonaws.com")
.addFormParam("Action", "DescribeVolumes")
.addFormParam("Signature", "nNxWg5dwYZEQu1QCzCtNp7iDmPR8wXXdKhWmLEKFLGI%3D")
.addFormParam("Signature", "nNxWg5dwYZEQu1QCzCtNp7iDmPR8wXXdKhWmLEKFLGI=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -117,10 +117,10 @@ public class ElasticBlockStoreApiTest extends BaseEC2ApiTest<ElasticBlockStoreAp
.addFormParam("Action", "AttachVolume")
.addFormParam("Device", "/device")
.addFormParam("InstanceId", "instanceId")
.addFormParam("Signature", "0%2BUY5oCQzoJapEHq4Dl2R/0nAA8uXEHqvHbnnNI5NcA%3D")
.addFormParam("Signature", "0+UY5oCQzoJapEHq4Dl2R/0nAA8uXEHqvHbnnNI5NcA=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("VolumeId", "id")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -149,10 +149,10 @@ public class ElasticBlockStoreApiTest extends BaseEC2ApiTest<ElasticBlockStoreAp
.addHeader("Host", "ec2.us-east-1.amazonaws.com")
.addFormParam("Action", "DetachVolume")
.addFormParam("Force", "false")
.addFormParam("Signature", "tfNB1g2WVqb3EwvBJlk4duU1H1fDOa1SBstsm1elpbg%3D")
.addFormParam("Signature", "tfNB1g2WVqb3EwvBJlk4duU1H1fDOa1SBstsm1elpbg=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("VolumeId", "id")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -183,10 +183,10 @@ public class ElasticBlockStoreApiTest extends BaseEC2ApiTest<ElasticBlockStoreAp
.addFormParam("Device", "/device")
.addFormParam("Force", "true")
.addFormParam("InstanceId", "instanceId")
.addFormParam("Signature", "VFhgwdkKBKXr/dEn2gvk6Vqq3JIunw4zZgM2Tt/ouME%3D")
.addFormParam("Signature", "VFhgwdkKBKXr/dEn2gvk6Vqq3JIunw4zZgM2Tt/ouME=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("VolumeId", "id")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -309,11 +309,11 @@ public class ElasticBlockStoreApiTest extends BaseEC2ApiTest<ElasticBlockStoreAp
.addFormParam("Action", "ModifySnapshotAttribute")
.addFormParam("Attribute", "createVolumePermission")
.addFormParam("OperationType", "add")
.addFormParam("Signature", "s8m8DqQRXmecWguuRjxfl3Ibd%2B1AjjktGzTlJLUTcPc%3D")
.addFormParam("Signature", "s8m8DqQRXmecWguuRjxfl3Ibd+1AjjktGzTlJLUTcPc=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("SnapshotId", "snapshotId")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("UserGroup.1", "all")
.addFormParam("UserId.1", "bob")
.addFormParam("UserId.2", "sue")
@ -346,11 +346,11 @@ public class ElasticBlockStoreApiTest extends BaseEC2ApiTest<ElasticBlockStoreAp
.addFormParam("Action", "ModifySnapshotAttribute")
.addFormParam("Attribute", "createVolumePermission")
.addFormParam("OperationType", "remove")
.addFormParam("Signature", "RzxHUIWV80cyhQDtrMiHDWUosS1g8cn1%2B7ONLJCe1dg%3D")
.addFormParam("Signature", "RzxHUIWV80cyhQDtrMiHDWUosS1g8cn1+7ONLJCe1dg=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("SnapshotId", "snapshotId")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("UserGroup.1", "all")
.addFormParam("UserId.1", "bob")
.addFormParam("UserId.2", "sue")

4
apis/ec2/src/test/java/org/jclouds/ec2/features/ElasticIPAddressApiTest.java
View File

@ -61,10 +61,10 @@ public class ElasticIPAddressApiTest extends BaseEC2ApiTest<ElasticIPAddressApi>
.addFormParam("Action", "AssociateAddress")
.addFormParam("InstanceId", "me")
.addFormParam("PublicIp", "127.0.0.1")
.addFormParam("Signature", "nLU6xGLqXtT/dmyAvkN4BdL/3CxQlDWJYeskikhl54k%3D")
.addFormParam("Signature", "nLU6xGLqXtT/dmyAvkN4BdL/3CxQlDWJYeskikhl54k=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();

26
apis/ec2/src/test/java/org/jclouds/ec2/features/InstanceApiTest.java
View File

@ -349,11 +349,11 @@ public class InstanceApiTest extends BaseEC2ApiTest<InstanceApi> {
.addFormParam("Action", "ModifyInstanceAttribute")
.addFormParam("Attribute", "userData")
.addFormParam("InstanceId", "1")
.addFormParam("Signature", "SfxT/1i/WokibleyEHo0zHizHisLzbDzzRxfOdnr1vY%3D")
.addFormParam("Signature", "SfxT/1i/WokibleyEHo0zHizHisLzbDzzRxfOdnr1vY=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Value", "dGVzdA%3D%3D")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Value", "dGVzdA==")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -382,10 +382,10 @@ public class InstanceApiTest extends BaseEC2ApiTest<InstanceApi> {
.addFormParam("Action", "ModifyInstanceAttribute")
.addFormParam("Attribute", "ramdisk")
.addFormParam("InstanceId", "1")
.addFormParam("Signature", "aMQzFsknmQt1OA8Rb8aIzZoFXGK23UvrMIy8imNVUeQ%3D")
.addFormParam("Signature", "aMQzFsknmQt1OA8Rb8aIzZoFXGK23UvrMIy8imNVUeQ=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Value", "test")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -415,10 +415,10 @@ public class InstanceApiTest extends BaseEC2ApiTest<InstanceApi> {
.addFormParam("Action", "ModifyInstanceAttribute")
.addFormParam("Attribute", "kernel")
.addFormParam("InstanceId", "1")
.addFormParam("Signature", "GaQ9sC0uXHlN5JAMWQpYx%2Bc3XaF38qZgJex/kyqdR1E%3D")
.addFormParam("Signature", "GaQ9sC0uXHlN5JAMWQpYx+c3XaF38qZgJex/kyqdR1E=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Value", "test")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -448,10 +448,10 @@ public class InstanceApiTest extends BaseEC2ApiTest<InstanceApi> {
.addFormParam("Action", "ModifyInstanceAttribute")
.addFormParam("Attribute", "disableApiTermination")
.addFormParam("InstanceId", "1")
.addFormParam("Signature", "hErzi%2Bf4jBADviJ%2BLVTTGhlHWhMR/pyPUSBZgaHC79I%3D")
.addFormParam("Signature", "hErzi+f4jBADviJ+LVTTGhlHWhMR/pyPUSBZgaHC79I=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Value", "true")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -482,10 +482,10 @@ public class InstanceApiTest extends BaseEC2ApiTest<InstanceApi> {
.addFormParam("Action", "ModifyInstanceAttribute")
.addFormParam("Attribute", "instanceType")
.addFormParam("InstanceId", "1")
.addFormParam("Signature", "OYJQ1w79NoxkcrawNK6U71k3Wl78kqz2ikzTXmQCX2E%3D")
.addFormParam("Signature", "OYJQ1w79NoxkcrawNK6U71k3Wl78kqz2ikzTXmQCX2E=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Value", "c1.medium")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -515,10 +515,10 @@ public class InstanceApiTest extends BaseEC2ApiTest<InstanceApi> {
.addFormParam("Action", "ModifyInstanceAttribute")
.addFormParam("Attribute", "instanceInitiatedShutdownBehavior")
.addFormParam("InstanceId", "1")
.addFormParam("Signature", "2Tgi9M9AcCv5Y%2BEXwq0SD6g8bBGtPPEgjdTtfdGZQlI%3D")
.addFormParam("Signature", "2Tgi9M9AcCv5Y+EXwq0SD6g8bBGtPPEgjdTtfdGZQlI=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Value", "terminate")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();

4
apis/ec2/src/test/java/org/jclouds/ec2/features/KeyPairApiExpectTest.java
View File

@ -38,10 +38,10 @@ public class KeyPairApiExpectTest extends BaseEC2ApiExpectTest<EC2Api> {
.addFormParam("Action", "DescribeKeyPairs")
.addFormParam("Filter.1.Name", "key-name")
.addFormParam("Filter.1.Value.1", "gsg-keypair")
.addFormParam("Signature", "xg8vGx%2Bv9UEG0%2BFGy%2BhincdI2ziWLbwPJvW85l%2Bvqwg%3D")
.addFormParam("Signature", "xg8vGx+v9UEG0+FGy+hincdI2ziWLbwPJvW85l+vqwg=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2012-04-16T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2012-04-16T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();

4
apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiExpectTest.java
View File

@ -38,10 +38,10 @@ public class SecurityGroupApiExpectTest extends BaseEC2ApiExpectTest<EC2Api> {
.addFormParam("Action", "DescribeSecurityGroups")
.addFormParam("Filter.1.Name", "owner-id")
.addFormParam("Filter.1.Value.1", "993194456877")
.addFormParam("Signature", "zk8EEWkG9Hi0bBLPueF9WdTUKapxQqUXgyJTxeZHXBc%3D")
.addFormParam("Signature", "zk8EEWkG9Hi0bBLPueF9WdTUKapxQqUXgyJTxeZHXBc=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2012-04-16T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2012-04-16T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();

12
apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiTest.java
View File

@ -63,10 +63,10 @@ public class SecurityGroupApiTest extends BaseEC2ApiTest<SecurityGroupApi> {
.addFormParam("Action", "CreateSecurityGroup")
.addFormParam("GroupDescription", "description")
.addFormParam("GroupName", "name")
.addFormParam("Signature", "msp9zFJLrRXYsVu/vbSZE8tQVS/TEvF0Cu/ldYVFdcA%3D")
.addFormParam("Signature", "msp9zFJLrRXYsVu/vbSZE8tQVS/TEvF0Cu/ldYVFdcA=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -151,10 +151,10 @@ public class SecurityGroupApiTest extends BaseEC2ApiTest<SecurityGroupApi> {
.addFormParam("FromPort", "6000")
.addFormParam("GroupName", "group")
.addFormParam("IpProtocol", "tcp")
.addFormParam("Signature", "xeaZpQ1Lvhp%2BqETpEzOPGHW6isAWYwgtBdCnTqWzkAw%3D")
.addFormParam("Signature", "xeaZpQ1Lvhp+qETpEzOPGHW6isAWYwgtBdCnTqWzkAw=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("ToPort", "7000")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -205,10 +205,10 @@ public class SecurityGroupApiTest extends BaseEC2ApiTest<SecurityGroupApi> {
.addFormParam("FromPort", "6000")
.addFormParam("GroupName", "group")
.addFormParam("IpProtocol", "tcp")
.addFormParam("Signature", "P5lxCXMwz6FE8Wo79nEMh8clgLDK3rZxCPRTOKssKKQ%3D")
.addFormParam("Signature", "P5lxCXMwz6FE8Wo79nEMh8clgLDK3rZxCPRTOKssKKQ=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("ToPort", "7000")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();

12
apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java
View File

@ -42,19 +42,19 @@ public class SubnetApiExpectTest extends BaseEC2ApiExpectTest<EC2Api> {
props.put(Constants.PROPERTY_API_VERSION, "2011-01-01");
return props;
}
HttpRequest list = HttpRequest.builder().method("POST")
.endpoint("https://ec2.us-east-1.amazonaws.com/")
.addHeader("Host", "ec2.us-east-1.amazonaws.com")
.addFormParam("Action", "DescribeSubnets")
.addFormParam("Signature", "Uuafp9lnYQmMUcf/JE1epPTQVCSMPqfns%2BwlZssUsi4%3D")
.addFormParam("Signature", "Uuafp9lnYQmMUcf/JE1epPTQVCSMPqfns+wlZssUsi4=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2012-04-16T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2012-04-16T15:54:08.897Z")
.addFormParam("Version", "2011-01-01")
.addFormParam("AWSAccessKeyId", "identity")
.build();
public void testListWhenResponseIs2xx() throws Exception {
HttpResponse listResponse = HttpResponse.builder().statusCode(200)
@ -82,10 +82,10 @@ public class SubnetApiExpectTest extends BaseEC2ApiExpectTest<EC2Api> {
.addFormParam("Action", "DescribeSubnets")
.addFormParam("Filter.1.Name", "subnet-id")
.addFormParam("Filter.1.Value.1", "subnet-9d4a7b6c")
.addFormParam("Signature", "%2Bp34YACfLk9km1H3eALnDmrkst9FhJttojVSf7VztLk%3D")
.addFormParam("Signature", "+p34YACfLk9km1H3eALnDmrkst9FhJttojVSf7VztLk=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2012-04-16T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2012-04-16T15:54:08.897Z")
.addFormParam("Version", "2011-01-01")
.addFormParam("AWSAccessKeyId", "identity").build();

4
apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiExpectTest.java
View File

@ -57,10 +57,10 @@ public class WindowsApiExpectTest extends BaseEC2ApiExpectTest<EC2Api> {
.addFormParam("Action", "DescribeBundleTasks")
.addFormParam("Filter.1.Name", "instance-id")
.addFormParam("Filter.1.Value.1", "i-12345678")
.addFormParam("Signature", "y0y3UBUKU/uYwbWPTCbkXzprU%2B8fMhg5LfF%2B5hWU2F4%3D")
.addFormParam("Signature", "y0y3UBUKU/uYwbWPTCbkXzprU+8fMhg5LfF+5hWU2F4=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Timestamp", "2012-04-16T15%3A54%3A08.897Z")
.addFormParam("Timestamp", "2012-04-16T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();

16
apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiTest.java
View File

@ -43,14 +43,14 @@ public class WindowsApiTest extends BaseEC2ApiTest<WindowsApi> {
.addHeader("Host", "ec2.us-east-1.amazonaws.com")
.addFormParam("Action", "BundleInstance")
.addFormParam("InstanceId", "i-e468cd8d")
.addFormParam("Signature", "78A6SjliGJg%2BKzaICB9I4bqEXFoNa4FKonuIwAj9hik%3D")
.addFormParam("Signature", "78A6SjliGJg+KzaICB9I4bqEXFoNa4FKonuIwAj9hik=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Storage.S3.Bucket", "my-bucket")
.addFormParam("Storage.S3.Prefix", "winami")
.addFormParam("Storage.S3.UploadPolicy", "eyJleHBpcmF0aW9uIjogIjIwMDgtMDgtMzBUMDg6NDk6MDlaIiwiY29uZGl0aW9ucyI6IFt7ImJ1Y2tldCI6ICJteS1idWNrZXQifSxbInN0YXJ0cy13aXRoIiwgIiRrZXkiLCAibXktbmV3LWltYWdlIl1dfQ%3D%3D")
.addFormParam("Storage.S3.UploadPolicySignature", "ih/iohGe0A7y4QVRbKaq6BZShzUsmBEJEa9AdFbxM6Y%3D")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Storage.S3.UploadPolicy", "eyJleHBpcmF0aW9uIjogIjIwMDgtMDgtMzBUMDg6NDk6MDlaIiwiY29uZGl0aW9ucyI6IFt7ImJ1Y2tldCI6ICJteS1idWNrZXQifSxbInN0YXJ0cy13aXRoIiwgIiRrZXkiLCAibXktbmV3LWltYWdlIl1dfQ==")
.addFormParam("Storage.S3.UploadPolicySignature", "ih/iohGe0A7y4QVRbKaq6BZShzUsmBEJEa9AdFbxM6Y=")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();
@ -86,15 +86,15 @@ public class WindowsApiTest extends BaseEC2ApiTest<WindowsApi> {
.addHeader("Host", "ec2.us-east-1.amazonaws.com")
.addFormParam("Action", "BundleInstance")
.addFormParam("InstanceId", "i-e468cd8d")
.addFormParam("Signature", "9UbWwb%2BnO2vHn2O59K9FpmaK445RwX7vXsruHRznwik%3D")
.addFormParam("Signature", "9UbWwb+nO2vHn2O59K9FpmaK445RwX7vXsruHRznwik=")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
.addFormParam("Storage.S3.AWSAccessKeyId", "10QMXFEV71ZS32XQFTR2")
.addFormParam("Storage.S3.Bucket", "my-bucket")
.addFormParam("Storage.S3.Prefix", "winami")
.addFormParam("Storage.S3.UploadPolicy", "eyJleHBpcmF0aW9uIjogIjIwMDgtMDgtMzBUMDg6NDk6MDlaIiwiY29uZGl0aW9ucyI6IFt7ImJ1Y2tldCI6ICJteS1idWNrZXQifSxbInN0YXJ0cy13aXRoIiwgIiRrZXkiLCAibXktbmV3LWltYWdlIl1dfQ%3D%3D")
.addFormParam("Storage.S3.UploadPolicySignature", "ih/iohGe0A7y4QVRbKaq6BZShzUsmBEJEa9AdFbxM6Y%3D")
.addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
.addFormParam("Storage.S3.UploadPolicy", "eyJleHBpcmF0aW9uIjogIjIwMDgtMDgtMzBUMDg6NDk6MDlaIiwiY29uZGl0aW9ucyI6IFt7ImJ1Y2tldCI6ICJteS1idWNrZXQifSxbInN0YXJ0cy13aXRoIiwgIiRrZXkiLCAibXktbmV3LWltYWdlIl1dfQ==")
.addFormParam("Storage.S3.UploadPolicySignature", "ih/iohGe0A7y4QVRbKaq6BZShzUsmBEJEa9AdFbxM6Y=")
.addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
.addFormParam("Version", "2010-08-31")
.addFormParam("AWSAccessKeyId", "identity").build();