lint: Resolved conflicts in linrinf rules.

northwood-labs · Oct 26, 2023 · 58555a5 · 58555a5
1 parent de6a00b
commit 58555a5
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 71 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -92,7 +92,7 @@ linters:
     # - godot
     - godox
     - gofmt
-    - gofumpt
+    # - gofumpt
     # - goheader
     - goimports
     # - golint # DEPRECATED
@@ -540,14 +540,14 @@ linters-settings:
       - pattern: a[b:len(a)]
         replacement: a[b:]
 
-  gofumpt:
-    # Module path which contains the source code being formatted.
-    # Default: ""
-    # module-path: github.com/org/project
+  # gofumpt:
+  #   # Module path which contains the source code being formatted.
+  #   # Default: ""
+  #   # module-path: github.com/org/project
 
-    # Choose whether to use the extra rules.
-    # Default: false
-    extra-rules: true
+  #   # Choose whether to use the extra rules.
+  #   # Default: false
+  #   extra-rules: true
 
   # goheader:
 
@@ -622,7 +622,7 @@ linters-settings:
     # Filter out the issues with a lower confidence than the given value.
     # Valid options are: low, medium, high.
     # Default: low
-    confidence: low
+    confidence: medium
 
     # Concurrency value.
     # Default: the number of logical CPUs usable by the current process.
@@ -1161,11 +1161,11 @@ linters-settings:
   whitespace:
     # Enforces newlines (or comments) after every multi-line if statement.
     # Default: false
-    multi-if: true
+    multi-if: false
 
     # Enforces newlines (or comments) after every multi-line function signature.
     # Default: false
-    multi-func: true
+    multi-func: false
 
   wrapcheck:
     # An array of strings that specify substrings of signatures to ignore.

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
       - id: check-executables-have-shebangs
       - id: check-json
       - id: check-merge-conflict
-      - id: check-symlinks
+      # - id: check-symlinks
       - id: check-toml
       - id: check-xml
       - id: check-yaml
@@ -32,28 +32,28 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: fix-byte-order-marker
-      - id: fix-encoding-pragma
-        args:
-          - --remove
+      # - id: fix-encoding-pragma
+      #   args:
+      #     - --remove
       - id: mixed-line-ending
         args:
           - --fix=lf
-      - id: requirements-txt-fixer
+      # - id: requirements-txt-fixer
       - id: trailing-whitespace
 
-  - repo: https://github.com/asottile/pyupgrade
-    rev: c21b4c4d153be0633357686c7697f539ac194868
-    hooks:
-      - id: pyupgrade
-        args:
-          - --py311-plus
+  # - repo: https://github.com/asottile/pyupgrade
+  #   rev: c21b4c4d153be0633357686c7697f539ac194868
+  #   hooks:
+  #     - id: pyupgrade
+  #       args:
+  #         - --py311-plus
 
-  - repo: https://github.com/asottile/reorder_python_imports
-    rev: c4fe43d9809f1507508b3aba24ad1a72b5407f58
-    hooks:
-      - id: reorder-python-imports
-        args:
-          - --py311-plus
+  # - repo: https://github.com/asottile/reorder_python_imports
+  #   rev: c4fe43d9809f1507508b3aba24ad1a72b5407f58
+  #   hooks:
+  #     - id: reorder-python-imports
+  #       args:
+  #         - --py311-plus
 
   - repo: https://github.com/skyzyx/git-hooks
     rev: 4a2f0dc93e5c5353ed5e619599b0d15e34df88db
@@ -75,7 +75,7 @@ repos:
           - -sr
       - id: terraform-fmt
       - id: yamlfmt
-      - id: yapf
+      # - id: yapf
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.36.0

diff --git a/corefuncprovider/env_ensure_data_source.go b/corefuncprovider/env_ensure_data_source.go
@@ -61,7 +61,6 @@ func (d *envEnsureDataSource) Metadata(
 	req datasource.MetadataRequest,
 	resp *datasource.MetadataResponse,
 ) {
-
 	tflog.Info(ctx, "Starting EnvEnsure DataSource Metadata method.")
 
 	resp.TypeName = req.ProviderTypeName + "_env_ensure"
@@ -78,7 +77,6 @@ func (d *envEnsureDataSource) Schema(
 	_ datasource.SchemaRequest,
 	resp *datasource.SchemaResponse,
 ) {
-
 	tflog.Info(ctx, "Starting EnvEnsure DataSource Schema method.")
 
 	resp.Schema = schema.Schema{
@@ -124,7 +122,6 @@ func (d *envEnsureDataSource) Configure(
 	req datasource.ConfigureRequest,
 	_ *datasource.ConfigureResponse,
 ) {
-
 	tflog.Info(ctx, "Starting EnvEnsure DataSource Configure method.")
 
 	if req.ProviderData == nil {
@@ -139,7 +136,6 @@ func (d *envEnsureDataSource) Create(
 	req resource.CreateRequest, // lint:allow_large_memory
 	resp *resource.CreateResponse,
 ) {
-
 	tflog.Info(ctx, "Starting EnvEnsure DataSource Create method.")
 
 	var plan envEnsureDataSourceModel
@@ -160,7 +156,6 @@ func (d *envEnsureDataSource) Read(
 	_ datasource.ReadRequest, // lint:allow_large_memory
 	resp *datasource.ReadResponse,
 ) {
-
 	tflog.Info(ctx, "Starting EnvEnsure DataSource Read method.")
 
 	var state envEnsureDataSourceModel

diff --git a/corefuncprovider/provider.go b/corefuncprovider/provider.go
@@ -47,7 +47,6 @@ func (p *coreFuncProvider) Metadata(
 	_ provider.MetadataRequest,
 	resp *provider.MetadataResponse,
 ) {
-
 	tflog.Info(ctx, "Starting Provider Metadata method.")
 
 	resp.TypeName = "corefunc"
@@ -93,7 +92,6 @@ func (p *coreFuncProvider) Configure(
 	_ provider.ConfigureRequest,
 	_ *provider.ConfigureResponse,
 ) {
-
 	tflog.Info(ctx, "Starting Provider Configure method.")
 	tflog.Info(ctx, "Ending Provider Configure method.")
 }

diff --git a/corefuncprovider/str_camel_data_source.go b/corefuncprovider/str_camel_data_source.go
@@ -59,7 +59,6 @@ func (d *strCamelDataSource) Metadata(
 	req datasource.MetadataRequest,
 	resp *datasource.MetadataResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrCamel DataSource Metadata method.")
 
 	resp.TypeName = req.ProviderTypeName + "_str_camel"
@@ -76,7 +75,6 @@ func (d *strCamelDataSource) Schema(
 	_ datasource.SchemaRequest,
 	resp *datasource.SchemaResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrCamel DataSource Schema method.")
 
 	resp.Schema = schema.Schema{
@@ -120,7 +118,6 @@ func (d *strCamelDataSource) Configure(
 	req datasource.ConfigureRequest,
 	_ *datasource.ConfigureResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrCamel DataSource Configure method.")
 
 	if req.ProviderData == nil {
@@ -135,7 +132,6 @@ func (d *strCamelDataSource) Create(
 	req resource.CreateRequest, // lint:allow_large_memory
 	resp *resource.CreateResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrCamel DataSource Create method.")
 
 	var plan strCamelDataSourceModel
@@ -156,7 +152,6 @@ func (d *strCamelDataSource) Read( // lint:no_dupe
 	_ datasource.ReadRequest, // lint:allow_large_memory
 	resp *datasource.ReadResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrCamel DataSource Read method.")
 
 	var state strCamelDataSourceModel

diff --git a/corefuncprovider/str_constant_data_source.go b/corefuncprovider/str_constant_data_source.go
@@ -58,7 +58,6 @@ func (d *strConstantDataSource) Metadata(
 	req datasource.MetadataRequest,
 	resp *datasource.MetadataResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrConstant DataSource Metadata method.")
 
 	resp.TypeName = req.ProviderTypeName + "_str_constant"
@@ -75,7 +74,6 @@ func (d *strConstantDataSource) Schema(
 	_ datasource.SchemaRequest,
 	resp *datasource.SchemaResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrConstant DataSource Schema method.")
 
 	resp.Schema = schema.Schema{
@@ -112,7 +110,6 @@ func (d *strConstantDataSource) Configure(
 	req datasource.ConfigureRequest,
 	_ *datasource.ConfigureResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrConstant DataSource Configure method.")
 
 	if req.ProviderData == nil {
@@ -127,7 +124,6 @@ func (d *strConstantDataSource) Create(
 	req resource.CreateRequest, // lint:allow_large_memory
 	resp *resource.CreateResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrConstant DataSource Create method.")
 
 	var plan strConstantDataSourceModel
@@ -148,7 +144,6 @@ func (d *strConstantDataSource) Read( // lint:no_dupe
 	_ datasource.ReadRequest, // lint:allow_large_memory
 	resp *datasource.ReadResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrConstant DataSource Read method.")
 
 	var state strConstantDataSourceModel

diff --git a/corefuncprovider/str_iterative_replace_data_source.go b/corefuncprovider/str_iterative_replace_data_source.go
@@ -61,7 +61,6 @@ func (d *strIterativeReplaceDataSource) Metadata(
 	req datasource.MetadataRequest,
 	resp *datasource.MetadataResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrIterativeReplace DataSource Metadata method.")
 
 	resp.TypeName = req.ProviderTypeName + "_str_iterative_replace"
@@ -78,7 +77,6 @@ func (d *strIterativeReplaceDataSource) Schema(
 	_ datasource.SchemaRequest,
 	resp *datasource.SchemaResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrIterativeReplace DataSource Schema method.")
 
 	resp.Schema = schema.Schema{
@@ -128,7 +126,6 @@ func (d *strIterativeReplaceDataSource) Configure(
 	req datasource.ConfigureRequest,
 	_ *datasource.ConfigureResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrIterativeReplace DataSource Configure method.")
 
 	if req.ProviderData == nil {
@@ -143,7 +140,6 @@ func (d *strIterativeReplaceDataSource) Create(
 	req resource.CreateRequest, // lint:allow_large_memory
 	resp *resource.CreateResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrIterativeReplace DataSource Create method.")
 
 	var plan strIterativeReplaceDataSourceModel
@@ -164,7 +160,6 @@ func (d *strIterativeReplaceDataSource) Read( // lint:no_dupe
 	_ datasource.ReadRequest, // lint:allow_large_memory
 	resp *datasource.ReadResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrIterativeReplace DataSource Read method.")
 
 	var state strIterativeReplaceDataSourceModel

diff --git a/corefuncprovider/str_kebab_data_source.go b/corefuncprovider/str_kebab_data_source.go
@@ -58,7 +58,6 @@ func (d *strKebabDataSource) Metadata(
 	req datasource.MetadataRequest,
 	resp *datasource.MetadataResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrKebab DataSource Metadata method.")
 
 	resp.TypeName = req.ProviderTypeName + "_str_kebab"
@@ -75,7 +74,6 @@ func (d *strKebabDataSource) Schema(
 	_ datasource.SchemaRequest,
 	resp *datasource.SchemaResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrKebab DataSource Schema method.")
 
 	resp.Schema = schema.Schema{
@@ -110,7 +108,6 @@ func (d *strKebabDataSource) Configure(
 	req datasource.ConfigureRequest,
 	_ *datasource.ConfigureResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrKebab DataSource Configure method.")
 
 	if req.ProviderData == nil {
@@ -125,7 +122,6 @@ func (d *strKebabDataSource) Create(
 	req resource.CreateRequest, // lint:allow_large_memory
 	resp *resource.CreateResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrKebab DataSource Create method.")
 
 	var plan strKebabDataSourceModel
@@ -146,7 +142,6 @@ func (d *strKebabDataSource) Read( // lint:no_dupe
 	_ datasource.ReadRequest, // lint:allow_large_memory
 	resp *datasource.ReadResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrKebab DataSource Read method.")
 
 	var state strKebabDataSourceModel

diff --git a/corefuncprovider/str_pascal_data_source.go b/corefuncprovider/str_pascal_data_source.go
@@ -59,7 +59,6 @@ func (d *strPascalDataSource) Metadata(
 	req datasource.MetadataRequest,
 	resp *datasource.MetadataResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrPascal DataSource Metadata method.")
 
 	resp.TypeName = req.ProviderTypeName + "_str_pascal"
@@ -76,7 +75,6 @@ func (d *strPascalDataSource) Schema(
 	_ datasource.SchemaRequest,
 	resp *datasource.SchemaResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrPascal DataSource Schema method.")
 
 	resp.Schema = schema.Schema{
@@ -120,7 +118,6 @@ func (d *strPascalDataSource) Configure(
 	req datasource.ConfigureRequest,
 	_ *datasource.ConfigureResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrPascal DataSource Configure method.")
 
 	if req.ProviderData == nil {
@@ -135,7 +132,6 @@ func (d *strPascalDataSource) Create(
 	req resource.CreateRequest, // lint:allow_large_memory
 	resp *resource.CreateResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrPascal DataSource Create method.")
 
 	var plan strPascalDataSourceModel
@@ -156,7 +152,6 @@ func (d *strPascalDataSource) Read( // lint:no_dupe
 	_ datasource.ReadRequest, // lint:allow_large_memory
 	resp *datasource.ReadResponse,
 ) {
-
 	tflog.Info(ctx, "Starting StrPascal DataSource Read method.")
 
 	var state strPascalDataSourceModel