clean up integration rule

gravitational · Jan 14, 2025 · 4e211ec · 4e211ec
1 parent b3a9f03
commit 4e211ec
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -190,26 +190,14 @@ linters-settings:
           - '!**/e/tests/**'
           - '!**/integrations/operator/controllers/resources/testlib/**'
         deny:
-          - pkg: github.com/gravitational/teleport/integration$
-            desc: 'integration test should not be imported outside of intergation tests'
-          - pkg: github.com/gravitational/teleport/integration/appaccess
-            desc: 'integration test should not be imported outside of intergation tests'
-          - pkg: github.com/gravitational/teleport/integration/autoupdate
-            desc: 'integration test should not be imported outside of intergation tests'
-          - pkg: github.com/gravitational/teleport/integration/conntest
-            desc: 'integration test should not be imported outside of intergation tests'
-          - pkg: github.com/gravitational/teleport/integration/db
-            desc: 'integration test should not be imported outside of intergation tests'
-          - pkg: github.com/gravitational/teleport/integration/helpers
-            desc: 'integration test should not be imported outside of intergation tests'
-          - pkg: github.com/gravitational/teleport/integration/integrations
-            desc: 'integration test should not be imported outside of intergation tests'
-          - pkg: github.com/gravitational/teleport/integration/kube
-            desc: 'integration test should not be imported outside of intergation tests'
-          - pkg: github.com/gravitational/teleport/integration/proxy
-            desc: 'integration test should not be imported outside of intergation tests'
-          - pkg: github.com/gravitational/teleport/integration/testdata
+          - pkg: github.com/gravitational/teleport/integration
             desc: 'integration test should not be imported outside of intergation tests'
+        allow:
+          # integrations is explicitly allowed becuase the deny rule above
+          # will match both integration and integrations, however only
+          # integration should be denied.
+          - github.com/gravitational/teleport/integrations
+        list-mode: lax
       # Prevent importing testing in production code.
       testing:
         files: