Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert PR (#832) #837

Merged
merged 1 commit into from
Jul 31, 2020
Merged

Revert PR (#832) #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions vault/data_source_aws_access_credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,9 @@ func awsAccessCredentialsDataSourceRead(d *schema.ResourceData, meta interface{}
d.Set("lease_start_time", time.Now().Format(time.RFC3339))
d.Set("lease_renewable", secret.Renewable)

rootPath := backend + "/config/root"
regionData, err := client.Logical().Read(rootPath)
if err != nil {
return fmt.Errorf("error reading from Vault: %s", err)
}
region := regionData.Data["region"].(string)

awsConfig := &aws.Config{
Credentials: credentials.NewStaticCredentials(accessKey, secretKey, securityToken),
HTTPClient: cleanhttp.DefaultClient(),
Region: &region,
}
sess, err := session.NewSession(awsConfig)
if err != nil {
Expand Down
23 changes: 8 additions & 15 deletions vault/data_source_aws_access_credentials_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,19 @@ import (
func TestAccDataSourceAWSAccessCredentials_basic(t *testing.T) {
mountPath := acctest.RandomWithPrefix("tf-test-aws")
accessKey, secretKey := getTestAWSCreds(t)
region := getTestAWSRegion(t)

resource.Test(t, resource.TestCase{
Providers: testProviders,
PreCheck: func() { testAccPreCheck(t) },
Steps: []resource.TestStep{
{
Config: testAccDataSourceAWSAccessCredentialsConfig_basic(mountPath, accessKey, secretKey, region),
Config: testAccDataSourceAWSAccessCredentialsConfig_basic(mountPath, accessKey, secretKey),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("data.vault_aws_access_credentials.test", "access_key"),
resource.TestCheckResourceAttrSet("data.vault_aws_access_credentials.test", "secret_key"),
resource.TestCheckResourceAttr("data.vault_aws_access_credentials.test", "security_token", ""),
resource.TestCheckResourceAttr("data.vault_aws_access_credentials.test", "type", "creds"),
resource.TestCheckResourceAttrSet("data.vault_aws_access_credentials.test", "lease_id"),
testAccDataSourceAWSAccessCredentialsCheck_tokenWorks(region),
testAccDataSourceAWSAccessCredentialsCheck_tokenWorks(),
),
},
},
Expand All @@ -43,7 +41,6 @@ func TestAccDataSourceAWSAccessCredentials_basic(t *testing.T) {
func TestAccDataSourceAWSAccessCredentials_sts(t *testing.T) {
mountPath := acctest.RandomWithPrefix("aws")
accessKey, secretKey := getTestAWSCreds(t)
region := getTestAWSRegion(t)

type testCase struct {
config string
Expand All @@ -57,7 +54,6 @@ func TestAccDataSourceAWSAccessCredentials_sts(t *testing.T) {
description = "Obtain AWS credentials."
access_key = "%s"
secret_key = "%s"
region = "%s"
}

resource "vault_aws_secret_backend_role" "role" {
Expand All @@ -71,7 +67,7 @@ func TestAccDataSourceAWSAccessCredentials_sts(t *testing.T) {
backend = "${vault_aws_secret_backend.aws.path}"
role = "${vault_aws_secret_backend_role.role.name}"
type = "sts"
}`, mountPath, accessKey, secretKey, region),
}`, mountPath, accessKey, secretKey),
},
"sts with role_arn": {
config: fmt.Sprintf(`
Expand All @@ -80,7 +76,6 @@ func TestAccDataSourceAWSAccessCredentials_sts(t *testing.T) {
description = "Obtain AWS credentials."
access_key = "%s"
secret_key = "%s"
region = "%s"
}

resource "vault_aws_secret_backend_role" "role" {
Expand All @@ -95,7 +90,7 @@ func TestAccDataSourceAWSAccessCredentials_sts(t *testing.T) {
role = "${vault_aws_secret_backend_role.role.name}"
type = "sts"
role_arn = "arn:aws:iam::012345678901:role/foobar"
}`, mountPath, accessKey, secretKey, region),
}`, mountPath, accessKey, secretKey),
},
}

Expand All @@ -113,7 +108,7 @@ func TestAccDataSourceAWSAccessCredentials_sts(t *testing.T) {
resource.TestCheckResourceAttrSet("data.vault_aws_access_credentials.test", "security_token"),
resource.TestCheckResourceAttr("data.vault_aws_access_credentials.test", "type", "sts"),
resource.TestCheckResourceAttrSet("data.vault_aws_access_credentials.test", "lease_id"),
testAccDataSourceAWSAccessCredentialsCheck_tokenWorks(region),
testAccDataSourceAWSAccessCredentialsCheck_tokenWorks(),
),
},
},
Expand All @@ -122,14 +117,13 @@ func TestAccDataSourceAWSAccessCredentials_sts(t *testing.T) {
}
}

func testAccDataSourceAWSAccessCredentialsConfig_basic(mountPath, accessKey, secretKey, region string) string {
func testAccDataSourceAWSAccessCredentialsConfig_basic(mountPath, accessKey, secretKey string) string {
return fmt.Sprintf(`
resource "vault_aws_secret_backend" "aws" {
path = "%s"
description = "Obtain AWS credentials."
access_key = "%s"
secret_key = "%s"
region = "%s"
}

resource "vault_aws_secret_backend_role" "role" {
Expand All @@ -143,10 +137,10 @@ data "vault_aws_access_credentials" "test" {
backend = "${vault_aws_secret_backend.aws.path}"
role = "${vault_aws_secret_backend_role.role.name}"
type = "creds"
}`, mountPath, accessKey, secretKey, region)
}`, mountPath, accessKey, secretKey)
}

func testAccDataSourceAWSAccessCredentialsCheck_tokenWorks(region string) resource.TestCheckFunc {
func testAccDataSourceAWSAccessCredentialsCheck_tokenWorks() resource.TestCheckFunc {
return func(s *terraform.State) error {
resourceState := s.Modules[0].Resources["data.vault_aws_access_credentials.test"]
if resourceState == nil {
Expand All @@ -166,7 +160,6 @@ func testAccDataSourceAWSAccessCredentialsCheck_tokenWorks(region string) resour
awsConfig := &aws.Config{
Credentials: credentials.NewStaticCredentials(accessKey, secretKey, securityToken),
HTTPClient: cleanhttp.DefaultClient(),
Region: &region,
}
sess, err := session.NewSession(awsConfig)
if err != nil {
Expand Down
8 changes: 0 additions & 8 deletions vault/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,6 @@ func getTestAWSCreds(t *testing.T) (string, string) {
return accessKey, secretKey
}

func getTestAWSRegion(t *testing.T) string {
region := os.Getenv("AWS_DEFAULT_REGION")
if region == "" {
t.Skip("AWS_DEFAULT_REGION not set")
}
return region
}

type azureTestConf struct {
SubscriptionID, TenantID, ClientID, ClientSecret, Scope string
}
Expand Down