Skip to content

Commit 58555a5

Browse files
skyzyxskyzyx
committed
lint: Resolved conflicts in linrinf rules.
1 parent de6a00b commit 58555a5

11 files changed

+29
-71
lines changed

‎.golangci.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ linters:
9292
# - godot
9393
- godox
9494
- gofmt
95-
- gofumpt
95+
# - gofumpt
9696
# - goheader
9797
- goimports
9898
# - golint # DEPRECATED
@@ -540,14 +540,14 @@ linters-settings:
540540
- pattern: a[b:len(a)]
541541
replacement: a[b:]
542542

543-
gofumpt:
544-
# Module path which contains the source code being formatted.
545-
# Default: ""
546-
# module-path: github.com/org/project
543+
# gofumpt:
544+
# # Module path which contains the source code being formatted.
545+
# # Default: ""
546+
# # module-path: github.com/org/project
547547

548-
# Choose whether to use the extra rules.
549-
# Default: false
550-
extra-rules: true
548+
# # Choose whether to use the extra rules.
549+
# # Default: false
550+
# extra-rules: true
551551

552552
# goheader:
553553

@@ -622,7 +622,7 @@ linters-settings:
622622
# Filter out the issues with a lower confidence than the given value.
623623
# Valid options are: low, medium, high.
624624
# Default: low
625-
confidence: low
625+
confidence: medium
626626

627627
# Concurrency value.
628628
# Default: the number of logical CPUs usable by the current process.
@@ -1161,11 +1161,11 @@ linters-settings:
11611161
whitespace:
11621162
# Enforces newlines (or comments) after every multi-line if statement.
11631163
# Default: false
1164-
multi-if: true
1164+
multi-if: false
11651165

11661166
# Enforces newlines (or comments) after every multi-line function signature.
11671167
# Default: false
1168-
multi-func: true
1168+
multi-func: false
11691169

11701170
wrapcheck:
11711171
# An array of strings that specify substrings of signatures to ignore.

‎.pre-commit-config.yaml

+18-18
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repos:
2222
- id: check-executables-have-shebangs
2323
- id: check-json
2424
- id: check-merge-conflict
25-
- id: check-symlinks
25+
# - id: check-symlinks
2626
- id: check-toml
2727
- id: check-xml
2828
- id: check-yaml
@@ -32,28 +32,28 @@ repos:
3232
- id: detect-private-key
3333
- id: end-of-file-fixer
3434
- id: fix-byte-order-marker
35-
- id: fix-encoding-pragma
36-
args:
37-
- --remove
35+
# - id: fix-encoding-pragma
36+
# args:
37+
# - --remove
3838
- id: mixed-line-ending
3939
args:
4040
- --fix=lf
41-
- id: requirements-txt-fixer
41+
# - id: requirements-txt-fixer
4242
- id: trailing-whitespace
4343

44-
- repo: https://github.com/asottile/pyupgrade
45-
rev: c21b4c4d153be0633357686c7697f539ac194868
46-
hooks:
47-
- id: pyupgrade
48-
args:
49-
- --py311-plus
44+
# - repo: https://github.com/asottile/pyupgrade
45+
# rev: c21b4c4d153be0633357686c7697f539ac194868
46+
# hooks:
47+
# - id: pyupgrade
48+
# args:
49+
# - --py311-plus
5050

51-
- repo: https://github.com/asottile/reorder_python_imports
52-
rev: c4fe43d9809f1507508b3aba24ad1a72b5407f58
53-
hooks:
54-
- id: reorder-python-imports
55-
args:
56-
- --py311-plus
51+
# - repo: https://github.com/asottile/reorder_python_imports
52+
# rev: c4fe43d9809f1507508b3aba24ad1a72b5407f58
53+
# hooks:
54+
# - id: reorder-python-imports
55+
# args:
56+
# - --py311-plus
5757

5858
- repo: https://github.com/skyzyx/git-hooks
5959
rev: 4a2f0dc93e5c5353ed5e619599b0d15e34df88db
@@ -75,7 +75,7 @@ repos:
7575
- -sr
7676
- id: terraform-fmt
7777
- id: yamlfmt
78-
- id: yapf
78+
# - id: yapf
7979

8080
- repo: https://github.com/igorshubovych/markdownlint-cli
8181
rev: v0.36.0

‎corefuncprovider/env_ensure_data_source.go

-5
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ func (d *envEnsureDataSource) Metadata(
6161
req datasource.MetadataRequest,
6262
resp *datasource.MetadataResponse,
6363
) {
64-
6564
tflog.Info(ctx, "Starting EnvEnsure DataSource Metadata method.")
6665

6766
resp.TypeName = req.ProviderTypeName + "_env_ensure"
@@ -78,7 +77,6 @@ func (d *envEnsureDataSource) Schema(
7877
_ datasource.SchemaRequest,
7978
resp *datasource.SchemaResponse,
8079
) {
81-
8280
tflog.Info(ctx, "Starting EnvEnsure DataSource Schema method.")
8381

8482
resp.Schema = schema.Schema{
@@ -124,7 +122,6 @@ func (d *envEnsureDataSource) Configure(
124122
req datasource.ConfigureRequest,
125123
_ *datasource.ConfigureResponse,
126124
) {
127-
128125
tflog.Info(ctx, "Starting EnvEnsure DataSource Configure method.")
129126

130127
if req.ProviderData == nil {
@@ -139,7 +136,6 @@ func (d *envEnsureDataSource) Create(
139136
req resource.CreateRequest, // lint:allow_large_memory
140137
resp *resource.CreateResponse,
141138
) {
142-
143139
tflog.Info(ctx, "Starting EnvEnsure DataSource Create method.")
144140

145141
var plan envEnsureDataSourceModel
@@ -160,7 +156,6 @@ func (d *envEnsureDataSource) Read(
160156
_ datasource.ReadRequest, // lint:allow_large_memory
161157
resp *datasource.ReadResponse,
162158
) {
163-
164159
tflog.Info(ctx, "Starting EnvEnsure DataSource Read method.")
165160

166161
var state envEnsureDataSourceModel

‎corefuncprovider/provider.go

-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ func (p *coreFuncProvider) Metadata(
4747
_ provider.MetadataRequest,
4848
resp *provider.MetadataResponse,
4949
) {
50-
5150
tflog.Info(ctx, "Starting Provider Metadata method.")
5251

5352
resp.TypeName = "corefunc"
@@ -93,7 +92,6 @@ func (p *coreFuncProvider) Configure(
9392
_ provider.ConfigureRequest,
9493
_ *provider.ConfigureResponse,
9594
) {
96-
9795
tflog.Info(ctx, "Starting Provider Configure method.")
9896
tflog.Info(ctx, "Ending Provider Configure method.")
9997
}

‎corefuncprovider/str_camel_data_source.go

-5
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ func (d *strCamelDataSource) Metadata(
5959
req datasource.MetadataRequest,
6060
resp *datasource.MetadataResponse,
6161
) {
62-
6362
tflog.Info(ctx, "Starting StrCamel DataSource Metadata method.")
6463

6564
resp.TypeName = req.ProviderTypeName + "_str_camel"
@@ -76,7 +75,6 @@ func (d *strCamelDataSource) Schema(
7675
_ datasource.SchemaRequest,
7776
resp *datasource.SchemaResponse,
7877
) {
79-
8078
tflog.Info(ctx, "Starting StrCamel DataSource Schema method.")
8179

8280
resp.Schema = schema.Schema{
@@ -120,7 +118,6 @@ func (d *strCamelDataSource) Configure(
120118
req datasource.ConfigureRequest,
121119
_ *datasource.ConfigureResponse,
122120
) {
123-
124121
tflog.Info(ctx, "Starting StrCamel DataSource Configure method.")
125122

126123
if req.ProviderData == nil {
@@ -135,7 +132,6 @@ func (d *strCamelDataSource) Create(
135132
req resource.CreateRequest, // lint:allow_large_memory
136133
resp *resource.CreateResponse,
137134
) {
138-
139135
tflog.Info(ctx, "Starting StrCamel DataSource Create method.")
140136

141137
var plan strCamelDataSourceModel
@@ -156,7 +152,6 @@ func (d *strCamelDataSource) Read( // lint:no_dupe
156152
_ datasource.ReadRequest, // lint:allow_large_memory
157153
resp *datasource.ReadResponse,
158154
) {
159-
160155
tflog.Info(ctx, "Starting StrCamel DataSource Read method.")
161156

162157
var state strCamelDataSourceModel

‎corefuncprovider/str_constant_data_source.go

-5
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func (d *strConstantDataSource) Metadata(
5858
req datasource.MetadataRequest,
5959
resp *datasource.MetadataResponse,
6060
) {
61-
6261
tflog.Info(ctx, "Starting StrConstant DataSource Metadata method.")
6362

6463
resp.TypeName = req.ProviderTypeName + "_str_constant"
@@ -75,7 +74,6 @@ func (d *strConstantDataSource) Schema(
7574
_ datasource.SchemaRequest,
7675
resp *datasource.SchemaResponse,
7776
) {
78-
7977
tflog.Info(ctx, "Starting StrConstant DataSource Schema method.")
8078

8179
resp.Schema = schema.Schema{
@@ -112,7 +110,6 @@ func (d *strConstantDataSource) Configure(
112110
req datasource.ConfigureRequest,
113111
_ *datasource.ConfigureResponse,
114112
) {
115-
116113
tflog.Info(ctx, "Starting StrConstant DataSource Configure method.")
117114

118115
if req.ProviderData == nil {
@@ -127,7 +124,6 @@ func (d *strConstantDataSource) Create(
127124
req resource.CreateRequest, // lint:allow_large_memory
128125
resp *resource.CreateResponse,
129126
) {
130-
131127
tflog.Info(ctx, "Starting StrConstant DataSource Create method.")
132128

133129
var plan strConstantDataSourceModel
@@ -148,7 +144,6 @@ func (d *strConstantDataSource) Read( // lint:no_dupe
148144
_ datasource.ReadRequest, // lint:allow_large_memory
149145
resp *datasource.ReadResponse,
150146
) {
151-
152147
tflog.Info(ctx, "Starting StrConstant DataSource Read method.")
153148

154149
var state strConstantDataSourceModel

‎corefuncprovider/str_iterative_replace_data_source.go

-5
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ func (d *strIterativeReplaceDataSource) Metadata(
6161
req datasource.MetadataRequest,
6262
resp *datasource.MetadataResponse,
6363
) {
64-
6564
tflog.Info(ctx, "Starting StrIterativeReplace DataSource Metadata method.")
6665

6766
resp.TypeName = req.ProviderTypeName + "_str_iterative_replace"
@@ -78,7 +77,6 @@ func (d *strIterativeReplaceDataSource) Schema(
7877
_ datasource.SchemaRequest,
7978
resp *datasource.SchemaResponse,
8079
) {
81-
8280
tflog.Info(ctx, "Starting StrIterativeReplace DataSource Schema method.")
8381

8482
resp.Schema = schema.Schema{
@@ -128,7 +126,6 @@ func (d *strIterativeReplaceDataSource) Configure(
128126
req datasource.ConfigureRequest,
129127
_ *datasource.ConfigureResponse,
130128
) {
131-
132129
tflog.Info(ctx, "Starting StrIterativeReplace DataSource Configure method.")
133130

134131
if req.ProviderData == nil {
@@ -143,7 +140,6 @@ func (d *strIterativeReplaceDataSource) Create(
143140
req resource.CreateRequest, // lint:allow_large_memory
144141
resp *resource.CreateResponse,
145142
) {
146-
147143
tflog.Info(ctx, "Starting StrIterativeReplace DataSource Create method.")
148144

149145
var plan strIterativeReplaceDataSourceModel
@@ -164,7 +160,6 @@ func (d *strIterativeReplaceDataSource) Read( // lint:no_dupe
164160
_ datasource.ReadRequest, // lint:allow_large_memory
165161
resp *datasource.ReadResponse,
166162
) {
167-
168163
tflog.Info(ctx, "Starting StrIterativeReplace DataSource Read method.")
169164

170165
var state strIterativeReplaceDataSourceModel

‎corefuncprovider/str_kebab_data_source.go

-5
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func (d *strKebabDataSource) Metadata(
5858
req datasource.MetadataRequest,
5959
resp *datasource.MetadataResponse,
6060
) {
61-
6261
tflog.Info(ctx, "Starting StrKebab DataSource Metadata method.")
6362

6463
resp.TypeName = req.ProviderTypeName + "_str_kebab"
@@ -75,7 +74,6 @@ func (d *strKebabDataSource) Schema(
7574
_ datasource.SchemaRequest,
7675
resp *datasource.SchemaResponse,
7776
) {
78-
7977
tflog.Info(ctx, "Starting StrKebab DataSource Schema method.")
8078

8179
resp.Schema = schema.Schema{
@@ -110,7 +108,6 @@ func (d *strKebabDataSource) Configure(
110108
req datasource.ConfigureRequest,
111109
_ *datasource.ConfigureResponse,
112110
) {
113-
114111
tflog.Info(ctx, "Starting StrKebab DataSource Configure method.")
115112

116113
if req.ProviderData == nil {
@@ -125,7 +122,6 @@ func (d *strKebabDataSource) Create(
125122
req resource.CreateRequest, // lint:allow_large_memory
126123
resp *resource.CreateResponse,
127124
) {
128-
129125
tflog.Info(ctx, "Starting StrKebab DataSource Create method.")
130126

131127
var plan strKebabDataSourceModel
@@ -146,7 +142,6 @@ func (d *strKebabDataSource) Read( // lint:no_dupe
146142
_ datasource.ReadRequest, // lint:allow_large_memory
147143
resp *datasource.ReadResponse,
148144
) {
149-
150145
tflog.Info(ctx, "Starting StrKebab DataSource Read method.")
151146

152147
var state strKebabDataSourceModel

‎corefuncprovider/str_pascal_data_source.go

-5
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ func (d *strPascalDataSource) Metadata(
5959
req datasource.MetadataRequest,
6060
resp *datasource.MetadataResponse,
6161
) {
62-
6362
tflog.Info(ctx, "Starting StrPascal DataSource Metadata method.")
6463

6564
resp.TypeName = req.ProviderTypeName + "_str_pascal"
@@ -76,7 +75,6 @@ func (d *strPascalDataSource) Schema(
7675
_ datasource.SchemaRequest,
7776
resp *datasource.SchemaResponse,
7877
) {
79-
8078
tflog.Info(ctx, "Starting StrPascal DataSource Schema method.")
8179

8280
resp.Schema = schema.Schema{
@@ -120,7 +118,6 @@ func (d *strPascalDataSource) Configure(
120118
req datasource.ConfigureRequest,
121119
_ *datasource.ConfigureResponse,
122120
) {
123-
124121
tflog.Info(ctx, "Starting StrPascal DataSource Configure method.")
125122

126123
if req.ProviderData == nil {
@@ -135,7 +132,6 @@ func (d *strPascalDataSource) Create(
135132
req resource.CreateRequest, // lint:allow_large_memory
136133
resp *resource.CreateResponse,
137134
) {
138-
139135
tflog.Info(ctx, "Starting StrPascal DataSource Create method.")
140136

141137
var plan strPascalDataSourceModel
@@ -156,7 +152,6 @@ func (d *strPascalDataSource) Read( // lint:no_dupe
156152
_ datasource.ReadRequest, // lint:allow_large_memory
157153
resp *datasource.ReadResponse,
158154
) {
159-
160155
tflog.Info(ctx, "Starting StrPascal DataSource Read method.")
161156

162157
var state strPascalDataSourceModel

0 commit comments

Comments
 (0)