Skip to content

Test/ci 1 #3062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ jobs:
go-version-file: .go-version
#go-version: '1.21'
cache: false

- name: Get root path
id: getRootPath
run: |
echo "::set-output path=$(pwd)"
shell: bash

- name: Get list of changed files
id: getDiffFile
Expand All @@ -58,6 +64,6 @@ jobs:
uses: golangci/golangci-lint-action@v3
with:
version: v1.63.4
working-directory: .
working-directory: ${{ steps.getRootPath.outputs.path }}
args: --new-from-rev=origin/master -v ${{ steps.getDiffFile.outputs.files }}
#args: --enable-all --max-same-issues=0 --max-issues-per-linter=0 --new-from-rev=origin/master -v
7 changes: 2 additions & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,25 @@ issues:
linters:
disable-all: true
enable:
- deadcode
- errcheck
- gofmt
- gosimple
- ineffassign
- misspell
- staticcheck
- structcheck
- unconvert
- unused
- varcheck
- vet

linters-settings:
errcheck:
ignore: github.com/hashicorp/terraform-plugin-sdk/helper/schema:ForceNew|Set,fmt:.*,io:Close
exclude-functions: github.com/hashicorp/terraform-plugin-sdk/helper/schema:ForceNew|Set,fmt:.*,io:Close

run:
modules-download-mode: vendor
timeout: 60m
# The default concurrency value is the number of available CPU.
concurrency: 12
concurrency: 2
# Allow multiple parallel golangci-lint instances running.
# If false (default) - golangci-lint acquires file lock on start.
allow-parallel-runners: true
4 changes: 2 additions & 2 deletions tencentcloud/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ func Provider() *schema.Provider {
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc(PROVIDER_SECRET_ID, nil),
Description: "This is the TencentCloud access key. It can also be sourced from the `TENCENTCLOUD_SECRET_ID` environment variable.",
Description: "111This is the TencentCloud access key. It can also be sourced from the `TENCENTCLOUD_SECRET_ID` environment variable.",
},
"secret_key": {
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc(PROVIDER_SECRET_KEY, nil),
Description: "This is the TencentCloud secret key. It can also be sourced from the `TENCENTCLOUD_SECRET_KEY` environment variable.",
Description: "111This is the TencentCloud secret key. It can also be sourced from the `TENCENTCLOUD_SECRET_KEY` environment variable.",
Sensitive: true,
},
"security_token": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ func DataSourceTencentCloudAuditCosRegions() *schema.Resource {
"result_output_file": {
Type: schema.TypeString,
Optional: true,
Description: "Used to save results.",
Description: "123Used to save results.",
},
"audit_cos_region_list": {
Type: schema.TypeList,
Computed: true,
Description: "List of available regions supported by audit cos.",
Description: "123List of available regions supported by audit cos.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"cos_region": {
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/services/bh/resource_tc_dasb_acl.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func ResourceTencentCloudDasbAcl() *schema.Resource {
"name": {
Required: true,
Type: schema.TypeString,
Description: "Acl name.",
Description: "123Acl name.",
},
"allow_disk_redirect": {
Required: true,
Expand Down
Loading