Skip to content

Commit ebef218

Browse files
committed
fix graphql
1 parent 0f6589e commit ebef218

8 files changed

+20
-18
lines changed

integration_tests/sonar/test_sonar_disable_graphql_introspection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class TestSonarDisableGraphQLIntrospection(SonarIntegrationTest):
1111
codemod = SonarDisableGraphQLIntrospection
1212
code_path = "tests/samples/disable_graphql_introspection.py"
1313
expected_new_code = """\
14-
from graphql_server.flask import GraphQLView
14+
from graphql_server.flask.views import GraphQLView
1515
from flask import Flask
1616
from graphql import (
1717
GraphQLSchema, GraphQLObjectType, GraphQLField, GraphQLString)

integration_tests/test_disable_graphql_introspection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class TestDisableGraphQLIntrospection(BaseIntegrationTest):
99
codemod = DisableGraphQLIntrospection
1010
original_code = """
11-
from graphql_server.flask import GraphQLView
11+
from graphql_server.flask.views import GraphQLView
1212
from flask import Flask
1313
from graphql import (
1414
GraphQLSchema, GraphQLObjectType, GraphQLField, GraphQLString)
@@ -32,7 +32,7 @@ class TestDisableGraphQLIntrospection(BaseIntegrationTest):
3232
)
3333
"""
3434
expected_new_code = """
35-
from graphql_server.flask import GraphQLView
35+
from graphql_server.flask.views import GraphQLView
3636
from flask import Flask
3737
from graphql import (
3838
GraphQLSchema, GraphQLObjectType, GraphQLField, GraphQLString)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ test = [
8484
"numpy ~= 2.3.0; python_version > '3.10'",
8585
"flask_wtf~=1.2.0",
8686
"fickling~=0.1.0,>=0.1.3",
87-
"graphql-server~=3.0.0b7",
87+
"graphql-server~=3.0.0b9",
8888
"unidiff>=0.7.5",
8989
"semgrep>=1.134,<1.135",
9090
]

src/core_codemods/disable_graphql_introspection.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ class FindGraphQLViewsWithIntrospection(
4141
supported_functions = {
4242
"graphql_server.flask.GraphQLView",
4343
"graphql_server.flask.GraphQLView.as_view",
44+
"graphql_server.flask.views.GraphQLView",
45+
"graphql_server.flask.views.GraphQLView.as_view",
4446
"graphql_server.sanic.GraphQLView",
4547
"graphql_server.aiohttp.GraphQLView",
4648
"graphql_server.webob.GraphQLView",

src/core_codemods/docs/pixee_python_disable-graphql-introspection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Introspection is often enabled by default in GraphQL without authentication. Thi
44

55
Our changes look something like this:
66
```diff
7-
from graphql_server.flask import GraphQLView
7+
from graphql_server.flask.views import GraphQLView
88
from flask import Flask
99
from graphql import (
1010
GraphQLSchema, GraphQLObjectType, GraphQLField, GraphQLString)

tests/codemods/sonar/test_sonar_disable_graphql_introspection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def test_name(self):
1515

1616
def test_simple(self, tmpdir):
1717
input_code = """
18-
from graphql_server.flask import GraphQLView
18+
from graphql_server.flask.views import GraphQLView
1919
from flask import Flask
2020
from .schemas import schema
2121
@@ -29,7 +29,7 @@ def test_simple(self, tmpdir):
2929
)
3030
"""
3131
expected = """
32-
from graphql_server.flask import GraphQLView
32+
from graphql_server.flask.views import GraphQLView
3333
from flask import Flask
3434
from .schemas import schema
3535
from graphql.validation import NoSchemaIntrospectionCustomRule

tests/codemods/test_disable_graphql_introspection.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_name(self):
1212

1313
def test_simple_flask(self, tmpdir):
1414
input_code = """
15-
from graphql_server.flask import GraphQLView
15+
from graphql_server.flask.views import GraphQLView
1616
from flask import Flask
1717
from .schemas import schema
1818
@@ -26,7 +26,7 @@ def test_simple_flask(self, tmpdir):
2626
)
2727
"""
2828
expected = """
29-
from graphql_server.flask import GraphQLView
29+
from graphql_server.flask.views import GraphQLView
3030
from flask import Flask
3131
from .schemas import schema
3232
from graphql.validation import NoSchemaIntrospectionCustomRule
@@ -77,7 +77,7 @@ def test_simple_constructor(self, tmpdir, module):
7777

7878
def test_add_indirect(self, tmpdir):
7979
input_code = """
80-
from graphql_server.flask import GraphQLView
80+
from graphql_server.flask.views import GraphQLView
8181
from flask import Flask
8282
from .schemas import schema
8383
@@ -89,7 +89,7 @@ def test_add_indirect(self, tmpdir):
8989
)
9090
"""
9191
expected = """
92-
from graphql_server.flask import GraphQLView
92+
from graphql_server.flask.views import GraphQLView
9393
from flask import Flask
9494
from .schemas import schema
9595
from graphql.validation import NoSchemaIntrospectionCustomRule
@@ -105,7 +105,7 @@ def test_add_indirect(self, tmpdir):
105105

106106
def test_add_list_double_indirect(self, tmpdir):
107107
input_code = """
108-
from graphql_server.flask import GraphQLView
108+
from graphql_server.flask.views import GraphQLView
109109
from flask import Flask
110110
from .schemas import schema
111111
@@ -117,7 +117,7 @@ def test_add_list_double_indirect(self, tmpdir):
117117
)
118118
"""
119119
expected = """
120-
from graphql_server.flask import GraphQLView
120+
from graphql_server.flask.views import GraphQLView
121121
from flask import Flask
122122
from .schemas import schema
123123
from graphql.validation import NoSchemaIntrospectionCustomRule
@@ -133,7 +133,7 @@ def test_add_list_double_indirect(self, tmpdir):
133133

134134
def test_add_dict_indirect(self, tmpdir):
135135
input_code = """
136-
from graphql_server.flask import GraphQLView
136+
from graphql_server.flask.views import GraphQLView
137137
from flask import Flask
138138
from .schemas import schema
139139
@@ -146,7 +146,7 @@ def test_add_dict_indirect(self, tmpdir):
146146
)
147147
"""
148148
expected = """
149-
from graphql_server.flask import GraphQLView
149+
from graphql_server.flask.views import GraphQLView
150150
from flask import Flask
151151
from .schemas import schema
152152
from graphql.validation import NoSchemaIntrospectionCustomRule
@@ -163,7 +163,7 @@ def test_add_dict_indirect(self, tmpdir):
163163

164164
def test_has_validation_rule(self, tmpdir):
165165
input_code = """
166-
from graphql_server.flask import GraphQLView
166+
from graphql_server.flask.views import GraphQLView
167167
from flask import Flask
168168
from .schemas import schema
169169
from graphql.validation import NoSchemaIntrospectionCustomRule
@@ -178,7 +178,7 @@ def test_has_validation_rule(self, tmpdir):
178178

179179
def test_has_graphene_validation_rule(self, tmpdir):
180180
input_code = """
181-
from graphql_server.flask import GraphQLView
181+
from graphql_server.flask.views import GraphQLView
182182
from flask import Flask
183183
from .schemas import schema
184184
from graphene.validation import DisableIntrospection

tests/samples/disable_graphql_introspection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from graphql_server.flask import GraphQLView
1+
from graphql_server.flask.views import GraphQLView
22
from flask import Flask
33
from graphql import (
44
GraphQLSchema, GraphQLObjectType, GraphQLField, GraphQLString)

0 commit comments

Comments
 (0)