diff --git a/docs/usage.md b/docs/usage.md index 0c7ae63..b949875 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -598,6 +598,7 @@ from blueapps.account.decorators import login_exempt from iam import IAM from iam.contrib.django.dispatcher import DjangoBasicResourceApiDispatcher from iam.resource.provider import ResourceProvider, ListResult +from iam.contrib.converter.queryset import PathEqDjangoQuerySetConverter from django.conf.urls import url, include iam = IAM( diff --git a/iam/__version__.py b/iam/__version__.py index aeaef40..97ab618 100644 --- a/iam/__version__.py +++ b/iam/__version__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -__version__ = "1.1.18" +__version__ = "1.1.19" diff --git a/iam/contrib/iam_migration/migrator.py b/iam/contrib/iam_migration/migrator.py index 2656a31..9bed2f1 100644 --- a/iam/contrib/iam_migration/migrator.py +++ b/iam/contrib/iam_migration/migrator.py @@ -36,16 +36,18 @@ def __init__(self, migration_json): self.migration_json = migration_json def migrate(self): - iam_host = settings.BK_IAM_INNER_HOST app_code = settings.APP_CODE app_secret = settings.SECRET_KEY + iam_host = "" USE_APIGATEWAY = getattr(settings, "BK_IAM_USE_APIGATEWAY", False) if USE_APIGATEWAY: do_migrate.enable_use_apigateway() iam_host = getattr(settings, "BK_IAM_APIGATEWAY_URL", "") if iam_host == "": raise exceptions.MigrationFailError("settings.BK_IAM_APIGATEWAY_URL should be setted") + else: + iam_host = settings.BK_IAM_INNER_HOST # only trigger migrator at db migrate if "migrate" not in sys.argv: diff --git a/release.md b/release.md index 206068b..9e7af8a 100644 --- a/release.md +++ b/release.md @@ -1,5 +1,9 @@ 版本日志 =============== +# v1.1.19 + +- bugfix: iam migration via apigateway should not use settings.BK_IAM_INNER_HOST + # v1.1.18 - bugfix: raise exception after replace esb api prefix