use single import path for aws-sdk-go
This commit is contained in:
parent
b7f66bdd9d
commit
4f25b552bb
|
@ -1,8 +1,9 @@
|
||||||
package aws
|
package aws
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/awslabs/aws-sdk-go/aws"
|
|
||||||
"github.com/hashicorp/terraform/helper/schema"
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
|
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
)
|
)
|
||||||
|
|
||||||
func makeAwsStringList(in []interface{}) []*string {
|
func makeAwsStringList(in []interface{}) []*string {
|
||||||
|
|
|
@ -5,11 +5,12 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/aws/aws-sdk-go/aws/credentials"
|
|
||||||
"github.com/awslabs/aws-sdk-go/aws/credentials/ec2rolecreds"
|
|
||||||
"github.com/hashicorp/terraform/helper/hashcode"
|
"github.com/hashicorp/terraform/helper/hashcode"
|
||||||
"github.com/hashicorp/terraform/helper/schema"
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
"github.com/hashicorp/terraform/terraform"
|
"github.com/hashicorp/terraform/terraform"
|
||||||
|
|
||||||
|
"github.com/aws/aws-sdk-go/aws/credentials"
|
||||||
|
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Provider returns a terraform.ResourceProvider.
|
// Provider returns a terraform.ResourceProvider.
|
||||||
|
|
|
@ -4,11 +4,12 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
|
"github.com/hashicorp/terraform/terraform"
|
||||||
|
|
||||||
"github.com/aws/aws-sdk-go/aws"
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
"github.com/aws/aws-sdk-go/service/iam"
|
"github.com/aws/aws-sdk-go/service/iam"
|
||||||
"github.com/aws/aws-sdk-go/service/opsworks"
|
"github.com/aws/aws-sdk-go/service/opsworks"
|
||||||
"github.com/hashicorp/terraform/helper/resource"
|
|
||||||
"github.com/hashicorp/terraform/terraform"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// These tests assume the existence of predefined Opsworks IAM roles named `aws-opsworks-ec2-role`
|
// These tests assume the existence of predefined Opsworks IAM roles named `aws-opsworks-ec2-role`
|
||||||
|
@ -49,7 +50,7 @@ resource "aws_opsworks_stack" "tf-acc" {
|
||||||
custom_cookbooks_source {
|
custom_cookbooks_source {
|
||||||
type = "git"
|
type = "git"
|
||||||
revision = "master"
|
revision = "master"
|
||||||
url = "https://github.com/awslabs/opsworks-example-cookbooks.git"
|
url = "https://github.com/aws/opsworks-example-cookbooks.git"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
@ -129,7 +130,7 @@ resource "aws_opsworks_stack" "tf-acc" {
|
||||||
custom_cookbooks_source {
|
custom_cookbooks_source {
|
||||||
type = "git"
|
type = "git"
|
||||||
revision = "master"
|
revision = "master"
|
||||||
url = "https://github.com/awslabs/opsworks-example-cookbooks.git"
|
url = "https://github.com/aws/opsworks-example-cookbooks.git"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
@ -259,7 +260,7 @@ var testAccAwsOpsworksStackCheckResourceAttrsUpdate = resource.ComposeTestCheckF
|
||||||
resource.TestCheckResourceAttr(
|
resource.TestCheckResourceAttr(
|
||||||
"aws_opsworks_stack.tf-acc",
|
"aws_opsworks_stack.tf-acc",
|
||||||
"custom_cookbooks_source.0.url",
|
"custom_cookbooks_source.0.url",
|
||||||
"https://github.com/awslabs/opsworks-example-cookbooks.git",
|
"https://github.com/aws/opsworks-example-cookbooks.git",
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ module APIs
|
||||||
|
|
||||||
module AWS
|
module AWS
|
||||||
def self.path
|
def self.path
|
||||||
@path ||= Pathname(`go list -f '{{.Dir}}' github.com/awslabs/aws-sdk-go/aws`.chomp).parent
|
@path ||= Pathname(`go list -f '{{.Dir}}' github.com/aws/aws-sdk-go/aws`.chomp).parent
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.api_json_files
|
def self.api_json_files
|
||||||
|
|
Loading…
Reference in New Issue