Skip to content

Commit 53f8437

Browse files
renovate[bot]cloudpossebotnitrocode
authored
chore(deps): update terraform cloudposse/efs/aws to v0.32.7 (#86)
* chore(deps): update terraform cloudposse/efs/aws to v0.32.7 * Auto Format * Add random * Update versions.tf * Update versions.tf * Auto Format * Update examples_complete_test.go * Update main.tf * Ensure attributes are part of outputs check * Bump terratest and testify Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: cloudpossebot <[email protected]> Co-authored-by: nitrocode <[email protected]>
1 parent 4ae2c93 commit 53f8437

File tree

8 files changed

+466
-381
lines changed

8 files changed

+466
-381
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ Available targets:
231231

232232
| Name | Version |
233233
|------|---------|
234-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
234+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.0 |
235235
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.0 |
236236

237237
## Providers
@@ -246,7 +246,7 @@ Available targets:
246246
|------|--------|---------|
247247
| <a name="module_cicd"></a> [cicd](#module\_cicd) | cloudposse/cicd/aws | 0.12.0 |
248248
| <a name="module_ecr"></a> [ecr](#module\_ecr) | cloudposse/ecr/aws | 0.34.0 |
249-
| <a name="module_efs"></a> [efs](#module\_efs) | cloudposse/efs/aws | 0.25.0 |
249+
| <a name="module_efs"></a> [efs](#module\_efs) | cloudposse/efs/aws | 0.32.7 |
250250
| <a name="module_efs_backup"></a> [efs\_backup](#module\_efs\_backup) | cloudposse/backup/aws | 0.13.1 |
251251
| <a name="module_elastic_beanstalk_application"></a> [elastic\_beanstalk\_application](#module\_elastic\_beanstalk\_application) | cloudposse/elastic-beanstalk-application/aws | 0.11.1 |
252252
| <a name="module_elastic_beanstalk_environment"></a> [elastic\_beanstalk\_environment](#module\_elastic\_beanstalk\_environment) | cloudposse/elastic-beanstalk-environment/aws | 0.36.1 |

‎docs/terraform.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
| Name | Version |
55
|------|---------|
6-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
6+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.0 |
77
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.0 |
88

99
## Providers
@@ -18,7 +18,7 @@
1818
|------|--------|---------|
1919
| <a name="module_cicd"></a> [cicd](#module\_cicd) | cloudposse/cicd/aws | 0.12.0 |
2020
| <a name="module_ecr"></a> [ecr](#module\_ecr) | cloudposse/ecr/aws | 0.34.0 |
21-
| <a name="module_efs"></a> [efs](#module\_efs) | cloudposse/efs/aws | 0.25.0 |
21+
| <a name="module_efs"></a> [efs](#module\_efs) | cloudposse/efs/aws | 0.32.7 |
2222
| <a name="module_efs_backup"></a> [efs\_backup](#module\_efs\_backup) | cloudposse/backup/aws | 0.13.1 |
2323
| <a name="module_elastic_beanstalk_application"></a> [elastic\_beanstalk\_application](#module\_elastic\_beanstalk\_application) | cloudposse/elastic-beanstalk-application/aws | 0.11.1 |
2424
| <a name="module_elastic_beanstalk_environment"></a> [elastic\_beanstalk\_environment](#module\_elastic\_beanstalk\_environment) | cloudposse/elastic-beanstalk-environment/aws | 0.36.1 |

‎examples/complete/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.13.0"
2+
required_version = ">= 0.14.0"
33

44
required_providers {
55
aws = {

‎main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ module "ecr" {
7373
# EFS to store Jenkins state (settings, jobs, etc.)
7474
module "efs" {
7575
source = "cloudposse/efs/aws"
76-
version = "0.25.0"
76+
version = "0.32.7"
7777
attributes = ["efs"]
7878
region = var.region
7979
vpc_id = var.vpc_id
8080
subnets = var.application_subnets
81-
zone_id = var.dns_zone_id
81+
zone_id = [var.dns_zone_id]
8282

8383
# EC2 instances (from `elastic_beanstalk_environment`) are allowed to connect to the EFS
8484
security_groups = [module.elastic_beanstalk_environment.security_group_id]

‎test/src/examples_complete_test.go

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
package test
22

33
import (
4+
"strings"
45
"testing"
6+
7+
"github.com/gruntwork-io/terratest/modules/random"
58
"github.com/gruntwork-io/terratest/modules/terraform"
69
"github.com/stretchr/testify/assert"
710
)
811

912
// Test the Terraform module in examples/complete using Terratest.
1013
func TestExamplesComplete(t *testing.T) {
1114
t.Parallel()
15+
randID := strings.ToLower(random.UniqueId())
16+
attributes := []string{randID}
17+
varFiles := []string{"fixtures.us-east-2.tfvars"}
1218

1319
terraformOptions := &terraform.Options{
1420
// The path to where our Terraform code is located
1521
TerraformDir: "../../examples/complete",
1622
Upgrade: true,
1723
// Variables to pass to our Terraform code using -var-file options
18-
VarFiles: []string{"fixtures.us-east-2.tfvars"},
24+
VarFiles: varFiles,
25+
Vars: map[string]interface{}{
26+
"attributes": attributes,
27+
},
1928
}
2029

2130
// At the end of the test, run `terraform destroy` to clean up any resources that were created
@@ -61,12 +70,12 @@ func TestExamplesComplete(t *testing.T) {
6170
// Run `terraform output` to get the value of an output variable
6271
elasticBeanstalkApplicationName := terraform.Output(t, terraformOptions, "elastic_beanstalk_application_name")
6372
// Verify we're getting back the outputs we expect
64-
assert.Equal(t, "eg-test-jenkins-app", elasticBeanstalkApplicationName)
73+
assert.Equal(t, "eg-test-jenkins-"+randID+"-app", elasticBeanstalkApplicationName)
6574

6675
// Run `terraform output` to get the value of an output variable
6776
elasticBeanstalkEnvironmentName := terraform.Output(t, terraformOptions, "elastic_beanstalk_environment_name")
6877
// Verify we're getting back the outputs we expect
69-
assert.Equal(t, "eg-test-jenkins-env", elasticBeanstalkEnvironmentName)
78+
assert.Equal(t, "eg-test-jenkins-"+randID+"-env", elasticBeanstalkEnvironmentName)
7079

7180
// Run `terraform output` to get the value of an output variable
7281
elasticBeanstalkEnvironmentHostname := terraform.Output(t, terraformOptions, "elastic_beanstalk_environment_hostname")
@@ -76,22 +85,22 @@ func TestExamplesComplete(t *testing.T) {
7685
// Run `terraform output` to get the value of an output variable
7786
ecrRepositoryName := terraform.Output(t, terraformOptions, "ecr_repository_name")
7887
// Verify we're getting back the outputs we expect
79-
assert.Equal(t, "eg-test-jenkins", ecrRepositoryName)
88+
assert.Equal(t, "eg-test-jenkins-"+randID, ecrRepositoryName)
8089

8190
// Run `terraform output` to get the value of an output variable
8291
codebuildProjectName := terraform.Output(t, terraformOptions, "codebuild_project_name")
8392
// Verify we're getting back the outputs we expect
84-
assert.Equal(t, "eg-test-jenkins-build-cicd", codebuildProjectName)
93+
assert.Equal(t, "eg-test-jenkins-build-"+randID+"-cicd", codebuildProjectName)
8594

8695
// Run `terraform output` to get the value of an output variable
8796
codebuildCacheBucketName := terraform.Output(t, terraformOptions, "codebuild_cache_bucket_name")
8897
// Verify we're getting back the outputs we expect
89-
assert.Contains(t, codebuildCacheBucketName, "eg-test-jenkins-build-cicd")
98+
assert.Contains(t, codebuildCacheBucketName, "eg-test-jenkins-build-"+randID+"-cicd")
9099

91100
// Run `terraform output` to get the value of an output variable
92101
codepipelineId := terraform.Output(t, terraformOptions, "codepipeline_id")
93102
// Verify we're getting back the outputs we expect
94-
assert.Equal(t, "eg-test-jenkins-cicd", codepipelineId)
103+
assert.Equal(t, "eg-test-jenkins-"+randID+"-cicd", codepipelineId)
95104

96105
// Run `terraform output` to get the value of an output variable
97106
efsArn := terraform.Output(t, terraformOptions, "efs_arn")
@@ -106,10 +115,10 @@ func TestExamplesComplete(t *testing.T) {
106115
// Run `terraform output` to get the value of an output variable
107116
efsBackupVaultArn := terraform.Output(t, terraformOptions, "efs_backup_vault_arn")
108117
// Verify we're getting back the outputs we expect
109-
assert.Equal(t, "arn:aws:backup:us-east-2:126450723953:backup-vault:eg-test-jenkins-efs", efsBackupVaultArn)
118+
assert.Equal(t, "arn:aws:backup:us-east-2:126450723953:backup-vault:eg-test-jenkins-"+randID+"-efs", efsBackupVaultArn)
110119

111120
// Run `terraform output` to get the value of an output variable
112121
efsBackupVaultId := terraform.Output(t, terraformOptions, "efs_backup_vault_id")
113122
// Verify we're getting back the outputs we expect
114-
assert.Equal(t, "eg-test-jenkins-efs", efsBackupVaultId)
123+
assert.Equal(t, "eg-test-jenkins-"+randID+"-efs", efsBackupVaultId)
115124
}

‎test/src/go.mod

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,58 @@
11
module github.com/cloudposse/terraform-aws-jenkins
22

3-
go 1.14
3+
go 1.17
44

55
require (
6-
github.com/gruntwork-io/terratest v0.30.23
7-
github.com/stretchr/testify v1.6.1
6+
github.com/gruntwork-io/terratest v0.40.16
7+
github.com/stretchr/testify v1.7.0
8+
)
9+
10+
require (
11+
cloud.google.com/go v0.83.0 // indirect
12+
cloud.google.com/go/storage v1.10.0 // indirect
13+
github.com/agext/levenshtein v1.2.3 // indirect
14+
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
15+
github.com/aws/aws-sdk-go v1.40.56 // indirect
16+
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
17+
github.com/davecgh/go-spew v1.1.1 // indirect
18+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
19+
github.com/golang/protobuf v1.5.2 // indirect
20+
github.com/golang/snappy v0.0.3 // indirect
21+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
22+
github.com/hashicorp/errwrap v1.0.0 // indirect
23+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
24+
github.com/hashicorp/go-getter v1.6.1 // indirect
25+
github.com/hashicorp/go-multierror v1.1.0 // indirect
26+
github.com/hashicorp/go-safetemp v1.0.0 // indirect
27+
github.com/hashicorp/go-version v1.3.0 // indirect
28+
github.com/hashicorp/hcl/v2 v2.9.1 // indirect
29+
github.com/hashicorp/terraform-json v0.13.0 // indirect
30+
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
31+
github.com/jmespath/go-jmespath v0.4.0 // indirect
32+
github.com/jstemmer/go-junit-report v0.9.1 // indirect
33+
github.com/klauspost/compress v1.13.0 // indirect
34+
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
35+
github.com/mitchellh/go-homedir v1.1.0 // indirect
36+
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
37+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
38+
github.com/pmezard/go-difflib v1.0.0 // indirect
39+
github.com/tmccombs/hcl2json v0.3.3 // indirect
40+
github.com/ulikunitz/xz v0.5.8 // indirect
41+
github.com/zclconf/go-cty v1.9.1 // indirect
42+
go.opencensus.io v0.23.0 // indirect
43+
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
44+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
45+
golang.org/x/mod v0.4.2 // indirect
46+
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
47+
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
48+
golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e // indirect
49+
golang.org/x/text v0.3.6 // indirect
50+
golang.org/x/tools v0.1.2 // indirect
51+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
52+
google.golang.org/api v0.47.0 // indirect
53+
google.golang.org/appengine v1.6.7 // indirect
54+
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
55+
google.golang.org/grpc v1.38.0 // indirect
56+
google.golang.org/protobuf v1.26.0 // indirect
57+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
858
)

0 commit comments

Comments
 (0)