Skip to content

Commit 6a0af59

Browse files
renovate[bot]apeabody
renovate[bot]
and
apeabody
authored
fix(deps): lints fixes for tflint (#192)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Peabody <[email protected]>
1 parent 81f37d1 commit 6a0af59

File tree

10 files changed

+146
-52
lines changed

10 files changed

+146
-52
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Make will use bash instead of sh
1919
SHELL := /usr/bin/env bash
2020

21-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.14
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.18
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

‎build/int.cloudbuild.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@ tags:
9292
- 'integration'
9393
substitutions:
9494
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
95-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'
95+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'

‎build/lint.cloudbuild.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ tags:
2121
- 'lint'
2222
substitutions:
2323
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
24-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'
24+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'

‎examples/datadog-sink/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
locals {
18-
datadog_svc = element(google_service_account.datadog-viewer.*.email, 0)
18+
datadog_svc = element(google_service_account.datadog-viewer[*].email, 0)
1919
log_writ = module.log_export.writer_identity
2020
}
2121

‎main.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ locals {
2424
is_billing_level = var.parent_resource_type == "billing_account"
2525

2626
# Locals for outputs to ensure the value is available after the resource is created
27-
log_sink_writer_identity = local.is_project_level ? element(concat(google_logging_project_sink.sink.*.writer_identity, [""]), 0) : local.is_folder_level ? element(concat(google_logging_folder_sink.sink.*.writer_identity, [""]), 0) : local.is_org_level ? element(concat(google_logging_organization_sink.sink.*.writer_identity, [""]), 0) : local.is_billing_level ? element(concat(google_logging_billing_account_sink.sink.*.writer_identity, [""]), 0) : ""
28-
log_sink_resource_id = local.is_project_level ? element(concat(google_logging_project_sink.sink.*.id, [""]), 0) : local.is_folder_level ? element(concat(google_logging_folder_sink.sink.*.id, [""]), 0) : local.is_org_level ? element(concat(google_logging_organization_sink.sink.*.id, [""]), 0) : local.is_billing_level ? element(concat(google_logging_billing_account_sink.sink.*.id, [""]), 0) : ""
29-
log_sink_resource_name = local.is_project_level ? element(concat(google_logging_project_sink.sink.*.name, [""]), 0) : local.is_folder_level ? element(concat(google_logging_folder_sink.sink.*.name, [""]), 0) : local.is_org_level ? element(concat(google_logging_organization_sink.sink.*.name, [""]), 0) : local.is_billing_level ? element(concat(google_logging_billing_account_sink.sink.*.name, [""]), 0) : ""
30-
log_sink_parent_id = local.is_project_level ? element(concat(google_logging_project_sink.sink.*.project, [""]), 0) : local.is_folder_level ? element(concat(google_logging_folder_sink.sink.*.folder, [""]), 0) : local.is_org_level ? element(concat(google_logging_organization_sink.sink.*.org_id, [""]), 0) : local.is_billing_level ? element(concat(google_logging_billing_account_sink.sink.*.billing_account, [""]), 0) : ""
27+
log_sink_writer_identity = local.is_project_level ? element(concat(google_logging_project_sink.sink[*].writer_identity, [""]), 0) : local.is_folder_level ? element(concat(google_logging_folder_sink.sink[*].writer_identity, [""]), 0) : local.is_org_level ? element(concat(google_logging_organization_sink.sink[*].writer_identity, [""]), 0) : local.is_billing_level ? element(concat(google_logging_billing_account_sink.sink[*].writer_identity, [""]), 0) : ""
28+
log_sink_resource_id = local.is_project_level ? element(concat(google_logging_project_sink.sink[*].id, [""]), 0) : local.is_folder_level ? element(concat(google_logging_folder_sink.sink[*].id, [""]), 0) : local.is_org_level ? element(concat(google_logging_organization_sink.sink[*].id, [""]), 0) : local.is_billing_level ? element(concat(google_logging_billing_account_sink.sink[*].id, [""]), 0) : ""
29+
log_sink_resource_name = local.is_project_level ? element(concat(google_logging_project_sink.sink[*].name, [""]), 0) : local.is_folder_level ? element(concat(google_logging_folder_sink.sink[*].name, [""]), 0) : local.is_org_level ? element(concat(google_logging_organization_sink.sink[*].name, [""]), 0) : local.is_billing_level ? element(concat(google_logging_billing_account_sink.sink[*].name, [""]), 0) : ""
30+
log_sink_parent_id = local.is_project_level ? element(concat(google_logging_project_sink.sink[*].project, [""]), 0) : local.is_folder_level ? element(concat(google_logging_folder_sink.sink[*].folder, [""]), 0) : local.is_org_level ? element(concat(google_logging_organization_sink.sink[*].org_id, [""]), 0) : local.is_billing_level ? element(concat(google_logging_billing_account_sink.sink[*].billing_account, [""]), 0) : ""
3131

3232
# Bigquery sink options
3333
bigquery_options = var.bigquery_options == null ? [] : var.unique_writer_identity == true ? tolist([var.bigquery_options]) : []

‎modules/bigquery/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
locals {
2222
dataset_name = element(
23-
concat(google_bigquery_dataset.dataset.*.dataset_id, [""]),
23+
concat(google_bigquery_dataset.dataset[*].dataset_id, [""]),
2424
0,
2525
)
2626
destination_uri = "bigquery.googleapis.com/projects/${var.project_id}/datasets/${local.dataset_name}"

‎modules/pubsub/main.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
#-----------------#
2020
locals {
2121
destination_uri = "pubsub.googleapis.com/projects/${var.project_id}/topics/${local.topic_name}"
22-
topic_name = element(concat(google_pubsub_topic.topic.*.name, [""]), 0)
22+
topic_name = element(concat(google_pubsub_topic.topic[*].name, [""]), 0)
2323
pubsub_subscriber = element(
24-
concat(google_service_account.pubsub_subscriber.*.email, [""]),
24+
concat(google_service_account.pubsub_subscriber[*].email, [""]),
2525
0,
2626
)
2727
pubsub_subscription = element(
28-
concat(google_pubsub_subscription.pubsub_subscription.*.id, [""]),
28+
concat(google_pubsub_subscription.pubsub_subscription[*].id, [""]),
2929
0,
3030
)
3131
pubsub_push_subscription = element(
32-
concat(google_pubsub_subscription.pubsub_push_subscription.*.id, [""]),
32+
concat(google_pubsub_subscription.pubsub_push_subscription[*].id, [""]),
3333
0,
3434
)
3535
subscriber_id = var.subscriber_id == "" ? "${local.topic_name}-subscriber" : var.subscriber_id

‎modules/storage/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
locals {
18-
storage_bucket_name = element(concat(google_storage_bucket.bucket.*.name, [""]), 0)
18+
storage_bucket_name = element(concat(google_storage_bucket.bucket[*].name, [""]), 0)
1919
destination_uri = "storage.googleapis.com/${local.storage_bucket_name}"
2020
}
2121

‎test/integration/go.mod‎

Lines changed: 46 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,87 @@
11
module github.com/terraform-google-modules/terraform-google-log-export/test/integration
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.21.5
46

57
require (
6-
github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.6.1
8+
github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1
79
github.com/stretchr/testify v1.8.4
810
)
911

1012
require (
11-
cloud.google.com/go v0.110.2 // indirect
12-
cloud.google.com/go/compute v1.19.3 // indirect
13+
cloud.google.com/go v0.110.7 // indirect
14+
cloud.google.com/go/compute v1.23.0 // indirect
1315
cloud.google.com/go/compute/metadata v0.2.3 // indirect
14-
cloud.google.com/go/iam v1.0.1 // indirect
15-
cloud.google.com/go/storage v1.30.1 // indirect
16+
cloud.google.com/go/iam v1.1.2 // indirect
17+
cloud.google.com/go/storage v1.33.0 // indirect
1618
github.com/agext/levenshtein v1.2.3 // indirect
1719
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
18-
github.com/aws/aws-sdk-go v1.44.271 // indirect
20+
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
21+
github.com/aws/aws-sdk-go v1.45.5 // indirect
1922
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2023
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/go-errors/errors v1.4.2 // indirect
22-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
24+
github.com/go-errors/errors v1.5.0 // indirect
25+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
2326
github.com/go-openapi/jsonreference v0.20.2 // indirect
24-
github.com/go-openapi/swag v0.22.3 // indirect
27+
github.com/go-openapi/swag v0.22.4 // indirect
2528
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2629
github.com/golang/protobuf v1.5.3 // indirect
2730
github.com/google/gnostic v0.6.9 // indirect
31+
github.com/google/gnostic-models v0.6.8 // indirect
2832
github.com/google/go-cmp v0.5.9 // indirect
2933
github.com/google/gofuzz v1.2.0 // indirect
30-
github.com/google/s2a-go v0.1.4 // indirect
31-
github.com/google/uuid v1.3.0 // indirect
32-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
33-
github.com/googleapis/gax-go/v2 v2.9.1 // indirect
34-
github.com/gruntwork-io/terratest v0.43.3 // indirect
34+
github.com/google/s2a-go v0.1.7 // indirect
35+
github.com/google/uuid v1.3.1 // indirect
36+
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
37+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
38+
github.com/gruntwork-io/terratest v0.46.8 // indirect
3539
github.com/hashicorp/errwrap v1.1.0 // indirect
3640
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
37-
github.com/hashicorp/go-getter v1.7.1 // indirect
41+
github.com/hashicorp/go-getter v1.7.2 // indirect
3842
github.com/hashicorp/go-multierror v1.1.1 // indirect
3943
github.com/hashicorp/go-safetemp v1.0.0 // indirect
4044
github.com/hashicorp/go-version v1.6.0 // indirect
41-
github.com/hashicorp/hcl/v2 v2.16.2 // indirect
42-
github.com/hashicorp/terraform-json v0.16.0 // indirect
43-
github.com/jinzhu/copier v0.3.5 // indirect
45+
github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect
46+
github.com/hashicorp/hcl/v2 v2.18.0 // indirect
47+
github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 // indirect
48+
github.com/hashicorp/terraform-json v0.17.1 // indirect
49+
github.com/jinzhu/copier v0.4.0 // indirect
4450
github.com/jmespath/go-jmespath v0.4.0 // indirect
4551
github.com/josharian/intern v1.0.0 // indirect
46-
github.com/klauspost/compress v1.16.5 // indirect
52+
github.com/klauspost/compress v1.16.7 // indirect
4753
github.com/mailru/easyjson v0.7.7 // indirect
4854
github.com/mattn/go-zglob v0.0.4 // indirect
4955
github.com/mitchellh/go-homedir v1.1.0 // indirect
5056
github.com/mitchellh/go-testing-interface v1.14.2-0.20210821155943-2d9075ca8770 // indirect
5157
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
5258
github.com/pmezard/go-difflib v1.0.0 // indirect
53-
github.com/tidwall/gjson v1.14.4 // indirect
59+
github.com/tidwall/gjson v1.17.0 // indirect
5460
github.com/tidwall/match v1.1.1 // indirect
5561
github.com/tidwall/pretty v1.2.1 // indirect
5662
github.com/tidwall/sjson v1.2.5 // indirect
57-
github.com/tmccombs/hcl2json v0.5.0 // indirect
63+
github.com/tmccombs/hcl2json v0.6.0 // indirect
5864
github.com/ulikunitz/xz v0.5.11 // indirect
59-
github.com/zclconf/go-cty v1.13.2 // indirect
65+
github.com/zclconf/go-cty v1.14.0 // indirect
6066
go.opencensus.io v0.24.0 // indirect
61-
golang.org/x/crypto v0.9.0 // indirect
62-
golang.org/x/mod v0.11.0 // indirect
63-
golang.org/x/net v0.10.0 // indirect
64-
golang.org/x/oauth2 v0.8.0 // indirect
65-
golang.org/x/sys v0.8.0 // indirect
66-
golang.org/x/text v0.9.0 // indirect
67+
golang.org/x/crypto v0.17.0 // indirect
68+
golang.org/x/mod v0.14.0 // indirect
69+
golang.org/x/net v0.17.0 // indirect
70+
golang.org/x/oauth2 v0.12.0 // indirect
71+
golang.org/x/sync v0.3.0 // indirect
72+
golang.org/x/sys v0.15.0 // indirect
73+
golang.org/x/text v0.14.0 // indirect
6774
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
68-
google.golang.org/api v0.124.0 // indirect
69-
google.golang.org/appengine v1.6.7 // indirect
70-
google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
71-
google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e // indirect
72-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
73-
google.golang.org/grpc v1.55.0 // indirect
74-
google.golang.org/protobuf v1.30.0 // indirect
75+
google.golang.org/api v0.138.0 // indirect
76+
google.golang.org/appengine v1.6.8 // indirect
77+
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
78+
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
79+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
80+
google.golang.org/grpc v1.58.3 // indirect
81+
google.golang.org/protobuf v1.31.0 // indirect
7582
gopkg.in/yaml.v2 v2.4.0 // indirect
7683
gopkg.in/yaml.v3 v3.0.1 // indirect
77-
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
78-
sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
84+
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect
85+
sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect
86+
sigs.k8s.io/yaml v1.4.0 // indirect
7987
)

0 commit comments

Comments
 (0)