Update version.json

dsk-agent-api
product: release-0.1.15

dsk-database-api
product: release-0.1.26

README.md

@@ -1,22 +1,22 @@
 # DataSaker
-### dsk-23.03.12
+### dsk-23.03.13
 
 # Service Version
 |   Type   | Name                          |  Candidate Version  |  Release Version  |  Product Version  |
 |:--------:|:------------------------------|:-------------------:|:-----------------:|:-----------------:|
 |  front   | dsk-ui                        |   release-0.2.22    |  release-0.2.22   |  release-0.2.22   |
-|   api    | dsk-agent-api                 |   release-0.1.14    |  release-0.1.14   |  release-0.1.14   |
+|   api    | dsk-agent-api                 |   release-0.1.15    |  release-0.1.15   |  release-0.1.14   |
 |   api    | dsk-agentmanager-api          |    release-0.1.6    |   release-0.1.6   |   release-0.1.6   |
 |   api    | dsk-alert-api                 |   release-0.1.17    |  release-0.1.17   |  release-0.1.17   |
 |   api    | dsk-apm-api                   |   release-0.1.15    |  release-0.1.15   |  release-0.1.15   |
 |   api    | dsk-chart-api                 |    release-0.2.8    |   release-0.2.8   |   release-0.2.8   |
 |   api    | dsk-dashboard-api             |   release-0.1.16    |  release-0.1.16   |  release-0.1.16   |
-|   api    | dsk-database-api              |   release-0.1.22    |  release-0.1.22   |  release-0.1.22   |
+|   api    | dsk-database-api              |   release-0.1.26    |  release-0.1.26   |  release-0.1.22   |
 |   api    | dsk-infrastructure-api        |   release-0.1.15    |  release-0.1.15   |  release-0.1.15   |
-|   api    | dsk-log-api                   |   release-0.1.11    |  release-0.1.11   |  release-0.1.11   |
+|   api    | dsk-log-api                   |   release-0.1.12    |  release-0.1.12   |  release-0.1.12   |
 |   api    | dsk-notification-api          |    release-0.2.6    |   release-0.2.6   |   release-0.2.6   |
 |   api    | dsk-usergate-api              |   release-0.1.13    |  release-0.1.13   |  release-0.1.13   |
-|   api    | dsk-app-sender                |    release-0.2.0    |   release-0.2.0   |   release-0.2.0   |
+|   api    | dsk-app-sender                |    release-0.2.1    |   release-0.2.1   |   release-0.2.0   |
 |   api    | dsk-backoffice                |                     |                   |                   |
 |   api    | dsk-metering-batch            |                     |   release-0.0.3   |                   |
 |   api    | dsk-metering-blocking-batch   |                     |                   |                   |
@@ -31,4 +31,4 @@
 |  stream  | dsk-kafka2storage             |    release-0.1.3    |   release-0.1.3   |   release-0.1.3   |
 |  stream  | dsk-log-connector             |    release-0.1.3    |   release-0.1.3   |   release-0.1.3   |
 | datagate | dsk-datagate                  |    release-0.1.6    |   release-0.1.6   |   release-0.1.6   |
-| datagate | dsk-loggate                   |    release-0.1.4    |   release-0.1.3   |   release-0.1.3   |
+| datagate | dsk-loggate                   |    release-0.1.5    |   release-0.1.5   |   release-0.1.5   |

dashboard/logger.py

@@ -0,0 +1,33 @@
+import os, socket, logging
+
+host = os.environ.get('VERSION_MANAGEMENT_SERVICE_HOST', default='10.10.43.240')
+service = os.environ.get('VERSION_MANAGEMENT_SERVICE_PORT', default=31090)
+
+class PrintHandler(logging.Handler):
+    def emit(self, record):
+        msg = self.format(record)
+        print(msg)
+        
+def get_sock_name():
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.connect((host, service))
+    return sock.getsockname()[0]
+
+def setup_logger():
+    logger = logging.getLogger(__name__)
+    logger.setLevel(logging.INFO)
+    log_file='dashboard/version-management.log'
+    formatter = logging.Formatter(f'%(asctime)s %(levelname)s {get_sock_name()} : %(message)s')
+
+    file_handler = logging.FileHandler(log_file)
+    file_handler.setFormatter(formatter)
+
+    print_handler = PrintHandler()
+    print_handler.setFormatter(formatter)
+
+    logger.addHandler(file_handler)
+    logger.addHandler(print_handler)
+
+    return logger
+
+logger = setup_logger()

dashboard/main.py

@@ -15,7 +15,7 @@ if __name__=='__main__':
         layout='wide'
     )
     
-    tab1, tab2 = st.tabs(["Deploy DataSaker", "Release Info"])
+    tab1, tab2 = st.tabs(["DataSaker", "Releases"])
     
     with tab1:
         st.header('DataSaker')
@@ -24,7 +24,6 @@ if __name__=='__main__':
         col1, col2 = st.columns([7, 3])
         with col1:
             st.subheader('Service')
-            
             if st.button('Data Reload'):
                 git_pull()
                 streamlit_js_eval(js_expressions='parent.window.location.reload()')
@@ -41,7 +40,8 @@ if __name__=='__main__':
                     'candidate_version': st.column_config.TextColumn('Candidate Version', validate=regex),
                     'release_version': st.column_config.TextColumn('Release Version', validate=regex),
                     'product_version': st.column_config.TextColumn('Product Version', validate=regex)
-                }
+                },
+                height=800
             )
         with col2:
             st.text('Edited Rows')

dashboard/settings.py

@@ -3,8 +3,8 @@ from git import Repo
 
 repo = Repo('.')
 file_path = './version.json'
-repo.config_writer().set_value('user', 'name', 'dsk-minchulahn').release()
+api_url = 'https://api.github.com/repos/cloudmoa/dsk-version-management/releases'
-repo.config_writer().set_value('user', 'email', 'minchulahn@ex-em.com').release()
+github_token = os.environ.get('GITHUB_TOKEN')
 
 def get_datasaker():
     return json.load(open(file_path, 'r'))['datasaker']
@@ -19,12 +19,25 @@ def get_tags():
     return repo.tags
 
 def get_github_releases():
-    api_url = 'https://api.github.com/repos/cloudmoa/dsk-version-management/releases'
-    github_token = os.environ.get('GITHUB_TOKEN')
     headers = {'Authorization': f'Bearer {github_token}', 'Accept': 'application/vnd.github.v3+json'}
     releases = requests.get(api_url, headers=headers).json()
     return releases
 
+def get_user_name_list():
+    users = ['', 'dsk-minchulahn', 'Ose-Exem', 'deukjin', 'pparkssi3']
+    return users
+
+def get_user_email(name):
+    if name == 'dsk-minchulahn': return 'minchulahn@ex-em.com'
+    elif name == 'Ose-Exem': return 'ose@ex-em.com'
+    elif name == 'deukjin': return 'djkim@ex-em.com'
+    elif name == 'pparkssi3': return 'pparkssi@ex-em.com'
+    else: return ''
+    
+def set_git_config(name, email):
+    repo.config_writer().set_value('user', 'name', name).release()
+    repo.config_writer().set_value('user', 'email', email).release()
+
 def diff():
     if len(repo.index.diff(repo.head.commit)) > 0:
         return True
@@ -51,8 +64,6 @@ def git_push(commit_message, extended_description):
         repo.git.push(force=False)
 
 def publish_release(selected_tag, release_title, release_describe):
-    api_url = 'https://api.github.com/repos/cloudmoa/sample-app/releases'
-    github_token = os.environ.get('GITHUB_TOKEN')
     headers = {'Authorization': f'Bearer {github_token}', 'Accept': 'application/vnd.github.v3+json'}
     release_data = {
         'tag_name': selected_tag,

dashboard/sidebar.py

@@ -2,6 +2,12 @@ import json, time
 import streamlit as st
 from streamlit_js_eval import streamlit_js_eval
 from settings import *
+from logger import logger
+
+if 'push_button_disabled' not in st.session_state:
+    st.session_state.push_button_disabled = True
+if 'release_button_disabled' not in st.session_state:
+    st.session_state.release_button_disabled = True
 
 def set_extended_description(edited_df):
     json_edited_df = json.loads(edited_df.to_json(orient='records'))
@@ -29,29 +35,40 @@ def show_sidebar(df, edited_df):
     with st.sidebar:
         st.subheader('Git Push')
         with st.expander('Git Push'):
+            selected_user_name = st.selectbox('User Name', get_user_name_list(), key='git_user_name')
+            set_git_config(selected_user_name, get_user_email(selected_user_name))
+            
             commit_message = st.text_input('Commit Message', value='Update version.json')
             extended_description = st.text_area('Extended description', value=set_extended_description(edited_df), height=200)
-                
+            
-            if st.button(key='push', label='Commit changes'):
+            if selected_user_name and commit_message:
-                if commit_message:
+                st.session_state.push_button_disabled = False
+            else:
+                st.session_state.push_button_disabled = True
+
+            if st.button(key='push', label='Commit changes', disabled=st.session_state.push_button_disabled):
+                if selected_user_name and commit_message:
                     if diff_remote_head():
                         if df.equals(edited_df):
+                            logger.warning(f'Git Push - No changes have been made | {selected_user_name}')
                             st.warning('No changes have been made', icon='⚠️')
                         else:
                             set_version_json(edited_df)
                             git_push(commit_message, extended_description)
+                            logger.info(f'Git Push - Success | {selected_user_name}')
                             st.success('Success', icon='✅')
                             time.sleep(1)
                             streamlit_js_eval(js_expressions='parent.window.location.reload()')
                     else:
+                        logger.error(f'Git Push - Updates were rejected because the tip of your current branch is behind | {selected_user_name}')
                         st.error('Updates were rejected because the tip of your current branch is behind', icon='🚨')
-                        
+        
         st.divider()
         
         st.subheader('Draft a new release')
         with st.expander('Draft a new release'):
             tags = [tag.name for tag in get_tags()]
-            tags.insert(0, "")
+            tags.insert(0, '')
             new_tag = st.text_input('Create a new tag')
             
             if new_tag:
@@ -64,15 +81,23 @@ def show_sidebar(df, edited_df):
             release_title = st.text_input('Release title', value=selected_tag)
             release_describe = st.text_area('Describe this release', value='## Production에 변경된 Version')
             
-            if st.button(key='release', label='Publish release'):
+            if selected_tag and release_title and release_describe:
-                response = publish_release(selected_tag, release_title, release_describe)
+                st.session_state.release_button_disabled = False
-                
+            else:
-                if response.status_code == 201:
+                st.session_state.release_button_disabled = True
-                    st.success('Release created successfully', icon='✅')
+            
-                    git_pull()
+            if st.button(key='release', label='Publish release', disabled=st.session_state.release_button_disabled):
-                    streamlit_js_eval(js_expressions='parent.window.location.reload()')
+                if selected_tag and release_title and release_describe:
-                else:
+                    response = publish_release(selected_tag, release_title, release_describe)
-                    st.error(f'Failed to create release. Status code: {response.status_code}', icon='🚨')
+                    
-                    st.error(f'Response: {response.text}', icon='🚨')
+                    if response.status_code == 201:
+                        logger.info(f'Publish Release - Release created successfully')
+                        st.success('Release created successfully', icon='✅')
+                        git_pull()
+                        streamlit_js_eval(js_expressions='parent.window.location.reload()')
+                    else:
+                        logger.error(f'Publish Release - Failed to create release. Status code: {response.status_code}')
+                        logger.error(f'Response: {response.text}')
+                        st.error(f'Failed to create release. Status code: {response.status_code}\n\n Response: {response.text}', icon='🚨')
         
-        st.divider()
+        st.divider()

version.json

@@ -1,5 +1,5 @@
 {
-    "datasaker": "dsk-23.03.12",
+    "datasaker": "dsk-23.03.13",
     "service": [
         {
             "type": "front",
@@ -12,10 +12,10 @@
         {
             "type": "api",
             "name": "dsk-agent-api",
-            "latest_candidate_version": "release-0.1.14",
+            "latest_candidate_version": "release-0.1.15",
-            "candidate_version": "release-0.1.14",
+            "candidate_version": "release-0.1.15",
-            "release_version": "release-0.1.14",
+            "release_version": "release-0.1.15",
-            "product_version": "release-0.1.14"
+            "product_version": "release-0.1.15"
         },
         {
             "type": "api",
@@ -60,10 +60,10 @@
         {
             "type": "api",
             "name": "dsk-database-api",
-            "latest_candidate_version": "release-0.1.22",
+            "latest_candidate_version": "release-0.1.26",
-            "candidate_version": "release-0.1.22",
+            "candidate_version": "release-0.1.26",
-            "release_version": "release-0.1.22",
+            "release_version": "release-0.1.26",
-            "product_version": "release-0.1.22"
+            "product_version": "release-0.1.26"
         },
         {
             "type": "api",
@@ -76,10 +76,10 @@
         {
             "type": "api",
             "name": "dsk-log-api",
-            "latest_candidate_version": "release-0.1.11",
+            "latest_candidate_version": "release-0.1.12",
-            "candidate_version": "release-0.1.11",
+            "candidate_version": "release-0.1.12",
-            "release_version": "release-0.1.11",
+            "release_version": "release-0.1.12",
-            "product_version": "release-0.1.11"
+            "product_version": "release-0.1.12"
         },
         {
             "type": "api",
@@ -100,9 +100,9 @@
         {
             "type": "api",
             "name": "dsk-app-sender",
-            "latest_candidate_version": "release-0.2.0",
+            "latest_candidate_version": "release-0.2.1",
-            "candidate_version": "release-0.2.0",
+            "candidate_version": "release-0.2.1",
-            "release_version": "release-0.2.0",
+            "release_version": "release-0.2.1",
             "product_version": "release-0.2.0"
         },
         {
@@ -221,9 +221,9 @@
             "type": "datagate",
             "name": "dsk-loggate",
             "latest_candidate_version": "release-0.1.5",
-            "candidate_version": "release-0.1.4",
+            "candidate_version": "release-0.1.5",
-            "release_version": "release-0.1.3",
+            "release_version": "release-0.1.5",
-            "product_version": "release-0.1.3"
+            "product_version": "release-0.1.5"
         }
     ]
 }