Skip to content

Commit 7d3069b

Browse files
committed
Merge remote-tracking branch 'origin/main' into update-dependencies-2025-02
2 parents 004b91c + a91b68d commit 7d3069b

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.github/workflows/go-lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
folder: [helpers/foundation-deployer]
3838
steps:
3939
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
40-
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
40+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4141
with:
4242
go-version-file: ${{ matrix.folder }}/go.mod
4343
cache-dependency-path: ${{ matrix.folder }}/go.sum
4444
- name: golangci-lint
45-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
45+
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
4646
with:
4747
version: latest
4848
working-directory: ${{ matrix.folder }}

.github/workflows/go-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
folder: [helpers/foundation-deployer]
4040
steps:
4141
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
42-
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
42+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4343
with:
4444
go-version-file: ${{ matrix.folder }}/go.mod
4545
cache-dependency-path: ${{ matrix.folder }}/go.sum

1-org/modules/centralized-logging/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ resource "terracurl_request" "exclude_external_logs" {
189189
count = var.project_options != null ? 1 : 0
190190

191191
name = "exclude_external_logs"
192+
destroy_skip = true
192193
url = "https://logging.googleapis.com/v2/projects/${var.logging_destination_project_id}/sinks/_Default?updateMask=exclusions"
193194
method = "PUT"
194195
response_codes = [200]

1-org/modules/centralized-logging/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ terraform {
2020
required_providers {
2121
terracurl = {
2222
source = "devops-rob/terracurl"
23-
version = "1.2.1"
23+
version = "1.2.2"
2424
}
2525
}
2626
}

0 commit comments

Comments
 (0)