Skip to content

Commit 8d9cdc4

Browse files
authored
Merge branch 'main' into skip-nil-wait-for-all
2 parents af6e643 + e3611ba commit 8d9cdc4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+768
-892
lines changed

.github/workflows/ci-test-go.yml

Lines changed: 53 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
TESTCONTAINERS_RYUK_DISABLED: "${{ inputs.ryuk-disabled }}"
4343
RYUK_CONNECTION_TIMEOUT: "${{ inputs.project-directory == 'modules/compose' && '5m' || '60s' }}"
4444
RYUK_RECONNECTION_TIMEOUT: "${{ inputs.project-directory == 'modules/compose' && '30s' || '10s' }}"
45+
SHOULD_RUN_SONAR: "false"
4546
strategy:
4647
matrix:
4748
platform: ${{ fromJSON(inputs.platforms) }}
@@ -55,6 +56,9 @@ jobs:
5556

5657
- name: Check out code into the Go module directory
5758
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
59+
with:
60+
# Disabling shallow clone is recommended for improving relevancy of reporting
61+
fetch-depth: 0
5862

5963
- name: Set up Go
6064
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
@@ -82,23 +86,6 @@ jobs:
8286
timeout-minutes: 30
8387
run: make test-unit
8488

85-
- name: Set sonar artifact name
86-
# For the core library, where the project directory is '.', we'll use "core" as artifact name.
87-
# For the modules, we'll remove the slashes, keeping the name of the module
88-
if: ${{ github.ref_name == 'main' && github.repository_owner == 'testcontainers' && matrix.platform == 'ubuntu-latest' && !inputs.rootless-docker && !inputs.ryuk-disabled }}
89-
run: |
90-
echo "ARTIFACT_NAME=$(basename ${{ inputs.project-directory == '.' && 'core' || inputs.project-directory }})-${{ inputs.go-version }}-${{ matrix.platform }}" >> $GITHUB_ENV
91-
92-
- name: Upload SonarCloud files
93-
if: ${{ github.ref_name == 'main' && github.repository_owner == 'testcontainers' && matrix.platform == 'ubuntu-latest' && !inputs.rootless-docker && !inputs.ryuk-disabled }}
94-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
95-
with:
96-
name: sonarcloud-${{ env.ARTIFACT_NAME }}
97-
path: |
98-
./sonar-project.properties
99-
${{ inputs.project-directory }}/TEST-unit.xml
100-
${{ inputs.project-directory }}/coverage.out
101-
10289
- name: Run checker
10390
run: |
10491
./scripts/check_environment.sh
@@ -108,3 +95,52 @@ jobs:
10895
with:
10996
paths: "**/${{ inputs.project-directory }}/TEST-unit*.xml"
11097
if: always()
98+
99+
- name: Decide if Sonar must be run
100+
if: ${{ matrix.platform == 'ubuntu-latest' }}
101+
run: |
102+
if [[ "1.23.x" == "${{ inputs.go-version }}" ]] && \
103+
[[ "true" != "${{ inputs.rootless-docker }}" ]] && \
104+
[[ "true" != "${{ inputs.ryuk-disabled }}" ]] && \
105+
[[ "main" == "${{ github.ref_name }}" ]] && \
106+
[[ "testcontainers" == "${{ github.repository_owner }}" ]]; then
107+
echo "SHOULD_RUN_SONAR=true" >> $GITHUB_ENV
108+
fi
109+
110+
- name: Set Sonar Cloud environment variables
111+
if: ${{ env.SHOULD_RUN_SONAR == 'true' }}
112+
run: |
113+
echo "PROJECT_VERSION=$(grep 'latest_version' mkdocs.yml | cut -d':' -f2 | tr -d ' ')" >> $GITHUB_ENV
114+
if [ "${{ inputs.project-directory }}" == "" ]; then
115+
echo "PROJECT_KEY=testcontainers_testcontainers-go" >> $GITHUB_ENV
116+
echo "PROJECT_NAME=testcontainers-go" >> $GITHUB_ENV
117+
echo "PROJECT_SRC_EXCLUSIONS=**/*_test.go,**/vendor/**,**/testdata/**,modules/**,examples/**,modulegen/**" >> $GITHUB_ENV
118+
echo "PROJECT_TEST_EXCLUSIONS=**/vendor/**,modules/**,examples/**,modulegen/**" >> $GITHUB_ENV
119+
else
120+
echo "PROJECT_KEY=testcontainers_testcontainers-go_$(echo ${{ inputs.project-directory }} | tr '/' '_')" >> $GITHUB_ENV
121+
echo "PROJECT_NAME=testcontainers-go-$(echo ${{ inputs.project-directory }} | tr '/' '-')" >> $GITHUB_ENV
122+
echo "PROJECT_SRC_EXCLUSIONS=**/*_test.go,**/vendor/**,**/testdata/**" >> $GITHUB_ENV
123+
echo "PROJECT_TEST_EXCLUSIONS=**/vendor/**" >> $GITHUB_ENV
124+
fi
125+
126+
- name: SonarQube Scan
127+
if: ${{ env.SHOULD_RUN_SONAR == 'true' }}
128+
uses: SonarSource/sonarqube-scan-action@0303d6b62e310685c0e34d0b9cde218036885c4d # v5.0.0
129+
env:
130+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
131+
with:
132+
projectBaseDir: "${{ inputs.project-directory == '' && '.' || inputs.project-directory }}"
133+
args: >
134+
-Dsonar.organization=testcontainers
135+
-Dsonar.projectKey=${{ env.PROJECT_KEY }}
136+
-Dsonar.projectName=${{ env.PROJECT_NAME }}
137+
-Dsonar.projectVersion=${{ env.PROJECT_VERSION }}
138+
-Dsonar.project.monorepo.enabled=true
139+
-Dsonar.branch.name=main
140+
-Dsonar.sources=.
141+
-Dsonar.exclusions=${{ env.PROJECT_SRC_EXCLUSIONS }}
142+
-Dsonar.tests=.
143+
-Dsonar.test.inclusions=**/*_test.go
144+
-Dsonar.test.exclusions=${{ env.PROJECT_TEST_EXCLUSIONS }}
145+
-Dsonar.go.coverage.reportPaths=coverage.out
146+
-Dsonar.go.tests.reportPaths=TEST-unit.xml

.github/workflows/ci.yml

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,17 @@ jobs:
6363
matrix:
6464
go-version: [1.23.x, 1.24.x]
6565
module: ${{ fromJSON(needs.detect-modules.outputs.modules) }}
66+
permissions:
67+
contents: read # for actions/checkout to fetch code
68+
pull-requests: read # for sonarsource/sonarcloud-github-action to determine which PR to decorate
6669
uses: ./.github/workflows/ci-test-go.yml
6770
with:
6871
go-version: ${{ matrix.go-version }}
6972
platforms: ${{ matrix.module == 'modulegen' && '["ubuntu-latest", "macos-latest", "windows-latest"]' || '["ubuntu-latest"]' }}
7073
project-directory: "${{ matrix.module }}"
7174
rootless-docker: false
7275
ryuk-disabled: false
76+
secrets: inherit
7377

7478
# The job below is a copy of the job above, but with ryuk disabled.
7579
# It's executed in the first stage to avoid concurrency issues.
@@ -124,30 +128,3 @@ jobs:
124128
run: exit 1
125129

126130
- run: echo "All tests completed successfully!"
127-
128-
sonarcloud:
129-
permissions:
130-
contents: read # for actions/checkout to fetch code
131-
pull-requests: read # for sonarsource/sonarcloud-github-action to determine which PR to decorate
132-
if: ${{ github.ref_name == 'main' && github.repository_owner == 'testcontainers' && needs.detect-modules.outputs.modules_count > 0 }}
133-
needs:
134-
- detect-modules
135-
- test
136-
runs-on: ubuntu-latest
137-
steps:
138-
- name: Check out code into the Go module directory
139-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
140-
with:
141-
# Disabling shallow clone is recommended for improving relevancy of reporting
142-
fetch-depth: 0
143-
144-
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
145-
with:
146-
pattern: sonarcloud-*
147-
merge-multiple: true
148-
149-
- name: Analyze with SonarCloud
150-
uses: sonarsource/sonarcloud-github-action@02ef91109b2d589e757aefcfb2854c2783fd7b19 # v4.0.0
151-
env:
152-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
153-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

examples/nginx/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ require (
5656
go.opentelemetry.io/otel v1.24.0 // indirect
5757
go.opentelemetry.io/otel/metric v1.24.0 // indirect
5858
go.opentelemetry.io/otel/trace v1.24.0 // indirect
59-
golang.org/x/crypto v0.31.0 // indirect
60-
golang.org/x/net v0.33.0 // indirect
61-
golang.org/x/sys v0.28.0 // indirect
59+
golang.org/x/crypto v0.35.0 // indirect
60+
golang.org/x/net v0.36.0 // indirect
61+
golang.org/x/sys v0.30.0 // indirect
6262
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
6363
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
6464
gopkg.in/yaml.v3 v3.0.1 // indirect

examples/nginx/go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
123123
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
124124
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
125125
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
126-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
127-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
126+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
127+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
128128
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
129129
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
130130
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
131131
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
132132
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
133133
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
134-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
135-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
134+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
135+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
136136
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
137137
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
138138
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -145,14 +145,14 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
145145
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
146146
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
147147
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
148-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
149-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
150-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
151-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
148+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
149+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
150+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
151+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
152152
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
153153
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
154-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
155-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
154+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
155+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
156156
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
157157
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
158158
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

examples/toxiproxy/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ require (
5858
go.opentelemetry.io/otel v1.24.0 // indirect
5959
go.opentelemetry.io/otel/metric v1.24.0 // indirect
6060
go.opentelemetry.io/otel/trace v1.24.0 // indirect
61-
golang.org/x/crypto v0.31.0 // indirect
62-
golang.org/x/net v0.33.0 // indirect
63-
golang.org/x/sys v0.28.0 // indirect
61+
golang.org/x/crypto v0.35.0 // indirect
62+
golang.org/x/net v0.36.0 // indirect
63+
golang.org/x/sys v0.30.0 // indirect
6464
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
6565
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
6666
gopkg.in/yaml.v3 v3.0.1 // indirect

examples/toxiproxy/go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,16 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
139139
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
140140
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
141141
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
142-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
143-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
142+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
143+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
144144
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
145145
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
146146
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
147147
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
148148
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
149149
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
150-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
151-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
150+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
151+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
152152
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
153153
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
154154
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -161,14 +161,14 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
161161
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
162162
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
163163
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
164-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
165-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
166-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
167-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
164+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
165+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
166+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
167+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
168168
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
169169
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
170-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
171-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
170+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
171+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
172172
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
173173
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
174174
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

modulegen/_template/sonar-project.properties.tmpl

Lines changed: 0 additions & 21 deletions
This file was deleted.

modulegen/cmd/modules/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var NewCmd = &cobra.Command{
2020
var RefreshModulesCmd = &cobra.Command{
2121
Use: "refresh",
2222
Short: "Refresh the module and example files",
23-
Long: "Refresh the module and example files, including the dependabot config, mkdocs config, sonar properties, vscode settings and makefiles for all the modules and examples",
23+
Long: "Refresh the module and example files, including the dependabot config, mkdocs config, vscode settings and makefiles for all the modules and examples",
2424
RunE: func(_ *cobra.Command, _ []string) error {
2525
ctx, err := context.GetRootContext()
2626
if err != nil {

modulegen/internal/context/context.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,6 @@ func (ctx Context) MkdocsConfigFile() string {
130130
return filepath.Join(ctx.RootDir, "mkdocs.yml")
131131
}
132132

133-
// SonarProjectFile returns, from the root directory, the relative path to the sonar project file, "/sonar-project.properties".
134-
func (ctx Context) SonarProjectFile() string {
135-
return filepath.Join(ctx.RootDir, "sonar-project.properties")
136-
}
137-
138133
// VSCodeWorkspaceFile returns, from the root directory, the relative path to the vscode workspace file, "/.vscode/.testcontainers-go.code-workspace".
139134
func (ctx Context) VSCodeWorkspaceFile() string {
140135
return filepath.Join(ctx.RootDir, ".vscode", ".testcontainers-go.code-workspace")

modulegen/internal/main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/testcontainers/testcontainers-go/modulegen/internal/make"
1010
"github.com/testcontainers/testcontainers-go/modulegen/internal/mkdocs"
1111
"github.com/testcontainers/testcontainers-go/modulegen/internal/module"
12-
"github.com/testcontainers/testcontainers-go/modulegen/internal/sonar"
1312
"github.com/testcontainers/testcontainers-go/modulegen/internal/tools"
1413
"github.com/testcontainers/testcontainers-go/modulegen/internal/vscode"
1514
)
@@ -72,7 +71,6 @@ func Refresh(ctx context.Context) error {
7271
mkdocs.Generator{}, // update examples in mkdocs
7372
dependabot.Generator{}, // update examples in dependabot
7473
vscode.Generator{}, // update vscode workspace
75-
sonar.Generator{}, // update sonar-project.properties
7674
}
7775

7876
for _, generator := range generators {
@@ -122,7 +120,6 @@ func GenerateFiles(ctx context.Context, tcModule context.TestcontainersModule) e
122120
// module generation
123121
projectGenerators := []ProjectGenerator{
124122
vscode.Generator{}, // update vscode workspace
125-
sonar.Generator{}, // update sonar-project.properties
126123
}
127124

128125
examples, err := ctx.GetExamples()

0 commit comments

Comments
 (0)