IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

migrate aws keypair test suite

Browse Source
This commit is contained in:
Clint Shryock 2015-04-06 15:13:29 -05:00
parent eb82f2bf2a
commit 6feba0bf36
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builtin/providers/aws/resource_aws_key_pair.go
View File

@ -5,8 +5,8 @@ import (
"github.com/hashicorp/terraform/helper/schema"
awsSDK "github.com/awslabs/aws-sdk-go/aws"
awsEC2 "github.com/awslabs/aws-sdk-go/service/ec2"
"github.com/awslabs/aws-sdk-go/aws"
"github.com/awslabs/aws-sdk-go/service/ec2"
)
func resourceAwsKeyPair() *schema.Resource {
@ -36,15 +36,15 @@ func resourceAwsKeyPair() *schema.Resource {
}
func resourceAwsKeyPairCreate(d *schema.ResourceData, meta interface{}) error {
ec2conn := meta.(*AWSClient).ec2SDKconn
conn := meta.(*AWSClient).ec2SDKconn
keyName := d.Get("key_name").(string)
publicKey := d.Get("public_key").(string)
req := &awsEC2.ImportKeyPairInput{
KeyName: awsSDK.String(keyName),
req := &ec2.ImportKeyPairInput{
KeyName: aws.String(keyName),
PublicKeyMaterial: []byte(publicKey),
}
resp, err := ec2conn.ImportKeyPair(req)
resp, err := conn.ImportKeyPair(req)
if err != nil {
return fmt.Errorf("Error import KeyPair: %s", err)
}
@ -54,11 +54,11 @@ func resourceAwsKeyPairCreate(d *schema.ResourceData, meta interface{}) error {
}
func resourceAwsKeyPairRead(d *schema.ResourceData, meta interface{}) error {
ec2conn := meta.(*AWSClient).ec2SDKconn
req := &awsEC2.DescribeKeyPairsInput{
KeyNames: []*string{awsSDK.String(d.Id())},
conn := meta.(*AWSClient).ec2SDKconn
req := &ec2.DescribeKeyPairsInput{
KeyNames: []*string{aws.String(d.Id())},
}
resp, err := ec2conn.DescribeKeyPairs(req)
resp, err := conn.DescribeKeyPairs(req)
if err != nil {
return fmt.Errorf("Error retrieving KeyPair: %s", err)
}
@ -75,10 +75,10 @@ func resourceAwsKeyPairRead(d *schema.ResourceData, meta interface{}) error {
}
func resourceAwsKeyPairDelete(d *schema.ResourceData, meta interface{}) error {
ec2conn := meta.(*AWSClient).ec2SDKconn
conn := meta.(*AWSClient).ec2SDKconn
_, err := ec2conn.DeleteKeyPair(&awsEC2.DeleteKeyPairInput{
KeyName: awsSDK.String(d.Id()),
_, err := conn.DeleteKeyPair(&ec2.DeleteKeyPairInput{
KeyName: aws.String(d.Id()),
})
return err
}

18
builtin/providers/aws/resource_aws_key_pair_test.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"testing"
"github.com/hashicorp/aws-sdk-go/aws"
"github.com/hashicorp/aws-sdk-go/gen/ec2"
"github.com/awslabs/aws-sdk-go/aws"
"github.com/awslabs/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
@ -30,7 +30,7 @@ func TestAccAWSKeyPair_normal(t *testing.T) {
}
func testAccCheckAWSKeyPairDestroy(s *terraform.State) error {
ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn
ec2SDKconn := testAccProvider.Meta().(*AWSClient).ec2SDKconn
for _, rs := range s.RootModule().Resources {
if rs.Type != "aws_key_pair" {
@ -38,8 +38,8 @@ func testAccCheckAWSKeyPairDestroy(s *terraform.State) error {
}
// Try to find key pair
resp, err := ec2conn.DescribeKeyPairs(&ec2.DescribeKeyPairsRequest{
KeyNames: []string{rs.Primary.ID},
resp, err := ec2SDKconn.DescribeKeyPairs(&ec2.DescribeKeyPairsInput{
KeyNames: []*string{aws.String(rs.Primary.ID)},
})
if err == nil {
if len(resp.KeyPairs) > 0 {
@ -81,10 +81,10 @@ func testAccCheckAWSKeyPairExists(n string, res *ec2.KeyPairInfo) resource.TestC
return fmt.Errorf("No KeyPair name is set")
}
ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn
ec2SDKconn := testAccProvider.Meta().(*AWSClient).ec2SDKconn
resp, err := ec2conn.DescribeKeyPairs(&ec2.DescribeKeyPairsRequest{
KeyNames: []string{rs.Primary.ID},
resp, err := ec2SDKconn.DescribeKeyPairs(&ec2.DescribeKeyPairsInput{
KeyNames: []*string{aws.String(rs.Primary.ID)},
})
if err != nil {
return err
@ -94,7 +94,7 @@ func testAccCheckAWSKeyPairExists(n string, res *ec2.KeyPairInfo) resource.TestC
return fmt.Errorf("KeyPair not found")
}
*res = resp.KeyPairs[0]
*res = *resp.KeyPairs[0]
return nil
}