Merge pull request #8 from stat-kwon/master

Apply SpaceONE 2.0

Dockerfile

@@ -21,4 +21,4 @@ RUN pip install --upgrade spaceone-api
 EXPOSE ${SPACEONE_PORT}
 
 ENTRYPOINT ["spaceone"]
-CMD ["grpc", "spaceone.board", "-m", "/opt"]
+CMD ["run", "grpc-server","spaceone.board", "-m", "/opt"]

deploy/helm/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.10
+version: 1.3.11
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

deploy/helm/config/config.yaml

@@ -1,7 +1,7 @@
 REMOTE_URL:
-- file:///opt/spaceone/board/config/database.yaml
-- file:///opt/spaceone/board/config/shared.yaml
-- file:///opt/spaceone/board/config/application.yaml
+  - file:///opt/spaceone/board/config/database.yaml
+  - file:///opt/spaceone/board/config/shared.yaml
+  - file:///opt/spaceone/board/config/application.yaml
 GLOBAL:
   MAX_WORKERS: 1000
   DATABASES:
@@ -30,14 +30,4 @@ GLOBAL:
     handlers:
       file:
         type: file
-        filename: /var/log/spaceone/board.log
-
-  HANDLERS:
-    authentication:
-    - backend: spaceone.core.handler.authentication_handler.AuthenticationGRPCHandler
-      uri: grpc+ssl://identity.dev.spaceone.dev:443/v1/Domain/get_public_key
-    authorization:
-    - backend: spaceone.core.handler.authorization_handler.AuthorizationGRPCHandler
-      uri: grpc+ssl://identity.dev.spaceone.dev:443/v1/Authorization/verify
-    mutation:
-    - backend: spaceone.core.handler.mutation_handler.SpaceONEMutationHandler
+        filename: /var/log/spaceone/board.log

deploy/helm/templates/deployment-rest.yaml

@@ -43,7 +43,7 @@ spec:
           resources:
           {{- toYaml .Values.resources.rest | nindent 12 }}
 {{- end }}
-          command: ['spaceone', 'rest', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}', '-p', '8000']
+          command: ['spaceone', 'run','rest-server', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}', '-p', '8000']
           ports:
             - containerPort: 8000
           volumeMounts:

deploy/helm/templates/deployment-scheduler.yaml

@@ -43,7 +43,7 @@ spec:
           resources:
           {{- toYaml .Values.resources.scheduler | nindent 12 }}
 {{- end }}
-          command: ['spaceone', 'scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}']
+          command: ['spaceone', 'run','scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}']
           volumeMounts:
             - name: default-conf
               mountPath: /opt/spaceone/{{ .Values.name }}/config/config.yaml
@@ -84,7 +84,7 @@ spec:
 {{- end }}
 
       volumes:
-        - name: default-conf 
+        - name: default-conf
           configMap:
             name: {{ .Values.name }}-conf
         - name: database-conf

deploy/helm/templates/deployment-worker.yaml

@@ -43,7 +43,7 @@ spec:
           resources:
           {{- toYaml .Values.resources.worker | nindent 12 }}
 {{- end }}
-          command: ['spaceone', 'scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}']
+          command: ['spaceone', 'run','scheduler', 'spaceone.{{ regexReplaceAll "-" .Values.name "_" }}']
           volumeMounts:
             - name: default-conf
               mountPath: /opt/spaceone/{{ .Values.name }}/config/config.yaml

src/setup.py

@@ -17,21 +17,15 @@
 from setuptools import setup, find_packages
 
 setup(
-    name='spaceone-board',
-    version=os.environ.get('PACKAGE_VERSION'),
-    description='SpaceONE board service',
-    long_description='',
-    url='https://www.spaceone.dev/',
-    author='MEGAZONE SpaceONE Team',
-    author_email='[email protected]',
-    license='Apache License 2.0',
+    name="spaceone-board",
+    version=os.environ.get("PACKAGE_VERSION"),
+    description="SpaceONE board service",
+    long_description="",
+    url="https://www.spaceone.dev/",
+    author="MEGAZONE SpaceONE Team",
+    author_email="[email protected]",
+    license="Apache License 2.0",
     packages=find_packages(),
-    install_requires=[
-        'spaceone-core',
-        'spaceone-api',
-        'mongoengine',
-        'boto3',
-        'redis'
-    ],
+    install_requires=["spaceone-core", "spaceone-api", "mongoengine", "boto3", "redis"],
     zip_safe=False,
 )

src/spaceone/__init__.py

@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

src/spaceone/board/conf/board_conf.py

@@ -1,5 +1 @@
-DEFAULT_BOARDS = [
-    {
-        'name': 'Notice'
-    }
-]
+DEFAULT_BOARDS = [{"name": "Notice"}]

src/spaceone/board/conf/global_conf.py

@@ -1,17 +1,17 @@
 # Database Settings
 DATABASES = {
-    'default': {
-        'db': 'board',
-        'host': 'localhost',
-        'port': 27017,
-        'username': '',
-        'password': ''
+    "default": {
+        "db": "board",
+        "host": "localhost",
+        "port": 27017,
+        "username": "",
+        "password": "",
     }
 }
 
 # Cache Settings
 CACHES = {
-    'default': {
+    "default": {
         # Redis Example
         # 'backend': 'spaceone.core.cache.redis_cache.RedisCache',
         # 'host': '<host>',
@@ -22,35 +22,34 @@
 
 # Handler Configuration
 HANDLERS = {
-    'authentication': [
+    "authentication": [
         # Default Authentication Handler
         # {
         #     'backend': 'spaceone.core.handler.authentication_handler.AuthenticationGRPCHandler',
         #     'uri': 'grpc://identity:50051/v1/Domain/get_public_key'
         # }
     ],
-    'authorization': [
+    "authorization": [
         # Default Authorization Handler
         # {
         #     'backend': 'spaceone.core.handler.authorization_handler.AuthorizationGRPCHandler',
         #     'uri': 'grpc://identity:50051/v1/Authorization/verify'
         # }
     ],
-    'mutation': [],
-    'event': []
+    "mutation": [],
+    "event": [],
 }
 
 # Connector Settings
 CONNECTORS = {
-    'SpaceConnector': {
-        'backend': 'spaceone.core.connector.space_connector.SpaceConnector',
-        'endpoints': {
-            'identity': 'grpc://identity:50051',
-            'file_manager': 'grpc://file-manager:50051',
-        }
+    "SpaceConnector": {
+        "backend": "spaceone.core.connector.space_connector.SpaceConnector",
+        "endpoints": {
+            "identity": "grpc://identity:50051",
+            "file_manager": "grpc://file-manager:50051",
+        },
     }
 }
 
 # Log Settings
-LOG = {
-}
+LOG = {}

src/spaceone/board/error/__init__.py

@@ -1,2 +1,2 @@
 from spaceone.board.error.board import *
-from spaceone.board.error.post import *
+from spaceone.board.error.post import *

src/spaceone/board/error/board.py

@@ -2,4 +2,4 @@
 
 
 class ERROR_BOARD_CATEGORIES_NOT_ALLOW_EMPTY(ERROR_INVALID_ARGUMENT):
-    _message = 'The board categories does not allow empty. (board_id = {board_id})'
+    _message = "The board categories does not allow empty. (board_id = {board_id})"

src/spaceone/board/error/post.py

@@ -2,20 +2,22 @@
 
 
 class ERROR_SETTING_CATEGORIES(ERROR_BASE):
-    _message = 'First, you need to set the categories of the board.'
+    _message = "First, you need to set the categories of the board."
 
 
 class ERROR_INVALID_CATEGORY(ERROR_BASE):
-    _message = 'Invalid category (category = {category}), you must choose one of {categories}'
+    _message = (
+        "Invalid category (category = {category}), you must choose one of {categories}"
+    )
 
 
 class ERROR_INVALID_KEY_IN_OPTIONS(ERROR_BASE):
-    _message = 'Invalid key in options'
+    _message = "Invalid key in options"
 
 
 class ERROR_NOT_FOUND_FILE(ERROR_BASE):
-    _message = '{file_id} does not exist in {domain_id}'
+    _message = "{file_id} does not exist in {domain_id}"
 
 
 class ERROR_INVALID_FILE_STATE(ERROR_BASE):
-    _message = 'file state is invalid (file_id = {file_id}, state = {state})'
+    _message = "file state is invalid (file_id = {file_id}, state = {state})"

src/spaceone/board/info/__init__.py

@@ -1,3 +1,3 @@
 from spaceone.board.info.common_info import *
 from spaceone.board.info.board_info import *
-from spaceone.board.info.post_info import *
+from spaceone.board.info.post_info import *

src/spaceone/board/info/board_info.py

@@ -8,20 +8,24 @@
 
 def BoardInfo(board_vo: Board, minimal=False):
     info = {
-        'board_id': board_vo.board_id,
-        'name': board_vo.name,
-        'categories': board_vo.categories,
+        "board_id": board_vo.board_id,
+        "name": board_vo.name,
+        "categories": board_vo.categories,
     }
 
     if not minimal:
-        info.update({
-            'tags': change_struct_type(board_vo.tags),
-            'created_at': utils.datetime_to_iso8601(board_vo.created_at)
-        })
+        info.update(
+            {
+                "tags": change_struct_type(board_vo.tags),
+                "created_at": utils.datetime_to_iso8601(board_vo.created_at),
+            }
+        )
 
     return board_pb2.BoardInfo(**info)
 
 
 def BoardsInfo(board_vos, total_count, **kwargs):
-    return board_pb2.BoardsInfo(results=list(
-        map(functools.partial(BoardInfo, **kwargs), board_vos)), total_count=total_count)
+    return board_pb2.BoardsInfo(
+        results=list(map(functools.partial(BoardInfo, **kwargs), board_vos)),
+        total_count=total_count,
+    )

src/spaceone/board/info/common_info.py

@@ -1,7 +1,7 @@
 from google.protobuf.empty_pb2 import Empty
 from spaceone.core.pygrpc.message_type import *
 
-__all__ = ['EmptyInfo', 'StatisticsInfo']
+__all__ = ["EmptyInfo", "StatisticsInfo"]
 
 
 def EmptyInfo():

src/spaceone/board/info/post_info.py

@@ -6,40 +6,43 @@
 
 from spaceone.board.model.post_model import Post
 
-__all__ = ['PostInfo', 'PostsInfo']
+__all__ = ["PostInfo", "PostsInfo"]
 
 
 def PostInfo(post_vo: Post, minimal=False, files_info=None):
     info = {
-        'board_id': post_vo.board_id,
-        'post_id': post_vo.post_id,
-        'post_type': post_vo.post_type,
-        'category': post_vo.category,
-        'title': post_vo.title,
-        'scope': post_vo.scope,
-        'domain_id': post_vo.domain_id,
+        "board_id": post_vo.board_id,
+        "post_id": post_vo.post_id,
+        "category": post_vo.category,
+        "title": post_vo.title,
+        "permission_group": post_vo.permission_group,
+        "domain_id": post_vo.domain_id,
     }
 
     if not minimal:
-        info.update({
-            'contents': post_vo.contents,
-            'view_count': post_vo.view_count,
-            'writer': post_vo.writer,
-            'options': change_struct_type(post_vo.options),
-            'user_id': post_vo.user_id,
-            'user_domain_id': post_vo.user_domain_id,
-            'created_at': utils.datetime_to_iso8601(post_vo.created_at),
-            'updated_at': utils.datetime_to_iso8601(post_vo.updated_at)
-        })
+        info.update(
+            {
+                "contents": post_vo.contents,
+                "view_count": post_vo.view_count,
+                "writer": post_vo.writer,
+                "options": change_struct_type(post_vo.options),
+                "user_id": post_vo.user_id,
+                "user_domain_id": post_vo.user_domain_id,
+                "created_at": utils.datetime_to_iso8601(post_vo.created_at),
+                "updated_at": utils.datetime_to_iso8601(post_vo.updated_at),
+            }
+        )
 
         if files_info:
-            info['files'] = change_list_value_type(files_info)
+            info["files"] = change_list_value_type(files_info)
         else:
-            info['files'] = change_list_value_type(post_vo.files)
+            info["files"] = change_list_value_type(post_vo.files)
 
     return post_pb2.PostInfo(**info)
 
 
 def PostsInfo(post_vos, total_count, **kwargs):
-    return post_pb2.PostsInfo(results=list(
-        map(functools.partial(PostInfo, **kwargs), post_vos)), total_count=total_count)
+    return post_pb2.PostsInfo(
+        results=list(map(functools.partial(PostInfo, **kwargs), post_vos)),
+        total_count=total_count,
+    )

src/spaceone/board/interface/grpc/__init__.py

@@ -0,0 +1,9 @@
+from spaceone.core.pygrpc.server import GRPCServer
+from spaceone.board.interface.grpc.board import Board
+from spaceone.board.interface.grpc.post import Post
+
+_all_ = ["app"]
+
+app = GRPCServer()
+app.add_service(Board)
+app.add_service(Post)