Skip to content
This repository has been archived by the owner on Jan 25, 2023. It is now read-only.

Update to the latest version of Vault #222

Merged
merged 2 commits into from
Oct 7, 2020
Merged

Update to the latest version of Vault #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b2be9d
Update to the latest version of Vault
brikis98 Oct 7, 2020
5df6e7e
Disable DNS check for S3 tests
brikis98 Oct 7, 2020
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
2 changes: 1 addition & 1 deletion examples/vault-consul-ami/vault-consul.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"min_packer_version": "0.12.0",
"variables": {
"aws_region": "us-east-1",
"vault_version": "1.1.0",
"vault_version": "1.5.4",
"consul_module_version": "v0.7.3",
"consul_version": "1.5.3",
"consul_download_url": "{{env `CONSUL_DOWNLOAD_URL`}}",
Expand Down
9 changes: 7 additions & 2 deletions test/vault_cluster_s3_backend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,12 @@ func runVaultWithS3BackendClusterTest(t *testing.T, amiId string, awsRegion, ssh
terraformOptions := test_structure.LoadTerraformOptions(t, examplesDir)
keyPair := test_structure.LoadEc2KeyPair(t, examplesDir)

cluster := initializeAndUnsealVaultCluster(t, OUTPUT_VAULT_CLUSTER_ASG_NAME, sshUserName, terraformOptions, awsRegion, keyPair)
testVaultUsesConsulForDns(t, cluster)
initializeAndUnsealVaultCluster(t, OUTPUT_VAULT_CLUSTER_ASG_NAME, sshUserName, terraformOptions, awsRegion, keyPair)

// TODO: temporarily disable DNS check until https://github.com/hashicorp/terraform-aws-consul/issues/155 is
// fixed. See https://github.com/hashicorp/terraform-aws-vault/pull/222 for details.
//
// cluster := initializeAndUnsealVaultCluster(t, OUTPUT_VAULT_CLUSTER_ASG_NAME, sshUserName, terraformOptions, awsRegion, nil)
// testVaultUsesConsulForDns(t, cluster)
})
}