refactor: move some files

paas/appmanager/APP-META-PRIVATE/db/131_add_app_version.up.sql

@@ -0,0 +1,16 @@
+CREATE TABLE `am_app_version`
+(
+    `id`                 bigint       NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `gmt_create`         datetime     NULL COMMENT '创建时间',
+    `gmt_modified`       datetime     NULL COMMENT '最后修改时间',
+    `app_id`             varchar(64)  NULL COMMENT '应用 ID (为空则全局)',
+    `version`            varchar(64)  NULL COMMENT '版本号',
+    `version_label`      varchar(128) NULL COMMENT '版本标签',
+    `version_properties` longtext COMMENT '版本属性',
+    PRIMARY KEY (`id`),
+    KEY `idx_gmt_create` (`gmt_create`),
+    KEY `idx_gmt_modified` (`gmt_modified`),
+    KEY `idx_app_id` (`app_id`),
+    KEY `version` (`version`),
+    KEY `version_label` (`version_label`)
+) DEFAULT CHARACTER SET = utf8mb4 COMMENT ='应用版本表';

paas/appmanager/APP-META-PRIVATE/postrun/06_init_plugins.py

@@ -72,8 +72,9 @@ def apply(r, plugin, plugin_version, version, plugin_zip_path):
         message = "upload plugin to appmanager failed, name=%s, response=%s" % (plugin, response.text)
         logger.warning(message)
         if "the plugin has been successfully registered and enabled" in response.text:
-            return
-        raise Exception(message)
+            logger.info("the plugin has been successfully registered and enabled %s" % plugin)
+        else:
+            raise Exception(message)
     else:
         logger.info("upload plugin to appmanager success, name=%s" % plugin)
     payload = json.dumps({

paas/appmanager/APP-META-PRIVATE/postrun/07_init_check_initjob.py

@@ -0,0 +1,59 @@
+# coding: utf-8
+
+import logging
+import os
+
+import sys
+import time
+import kubernetes
+
+
+logger = logging.getLogger()
+logger.setLevel(logging.INFO)
+
+handler = logging.StreamHandler(sys.stdout)
+handler.setLevel(logging.INFO)
+formatter = logging.Formatter('[%(asctime)s] [%(module)s.%(funcName)s:%(lineno)d] [%(levelname)s] - %(message)s')
+handler.setFormatter(formatter)
+logger.addHandler(handler)
+
+
+def main():
+    """
+    appmanager已经部署成功，但是initjob未正确创建
+    """
+    paas2 = os.getenv("PAAS_VERSION")
+    if paas2:
+        return
+    namespace = "apsara-bigdata-manager"
+    initjob = "abm-appmanager-initjob"
+    version = "v1"
+    plural = "appmanager"
+    name = "appmanager"
+    group = "abm.io"
+
+    success = False
+    kubernetes.config.load_incluster_config()
+    job_api = kubernetes.client.BatchV1Api()
+    api = kubernetes.client.CustomObjectsApi()
+    body = {
+        "metadata": {
+            "labels": {
+                "a": str(int(time.time()*1000))}
+        }
+    }
+    time.sleep(60)
+    while True:
+        try:
+            success = job_api.read_namespaced_job_status(initjob, namespace)
+        except Exception as e:
+            logger.error("%s find fail, error=%s" % (initjob, e.__str__()))
+        if success:
+            logger.info("%s already create" % initjob)
+            return
+        result = api.patch_namespaced_custom_object(group, version, namespace, plural, name, body)
+        logger.info("patch %s result=%s" % (name, result))
+        time.sleep(600)
+
+if __name__ == '__main__':
+    main()

paas/appmanager/plugin-api/pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.alibaba.tesla</groupId>
             <artifactId>tesla-appmanager-domain</artifactId>
-            <version>1.0.8-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
         <!-- fabric8 -->

paas/appmanager/pom.xml

@@ -7,10 +7,10 @@
     <groupId>com.alibaba.tesla</groupId>
     <artifactId>tesla-appmanager</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.8-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <modules>
         <module>tesla-appmanager-api</module>
-        <module>tesla-appmanager-common</module>
+        <module>tesla-appmanager-util</module>
         <module>tesla-appmanager-domain</module>
         <module>tesla-appmanager-autoconfig</module>
         <module>tesla-appmanager-trait</module>
@@ -123,7 +123,7 @@
             </dependency>
             <dependency>
                 <groupId>com.alibaba.tesla</groupId>
-                <artifactId>tesla-appmanager-common</artifactId>
+                <artifactId>tesla-appmanager-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

paas/appmanager/tesla-appmanager-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alibaba.tesla</groupId>
         <artifactId>tesla-appmanager</artifactId>
-        <version>1.0.8-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>com.alibaba.tesla</groupId>
-            <artifactId>tesla-appmanager-common</artifactId>
+            <artifactId>tesla-appmanager-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

paas/appmanager/tesla-appmanager-auth/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alibaba.tesla</groupId>
         <artifactId>tesla-appmanager</artifactId>
-        <version>1.0.8-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

paas/appmanager/tesla-appmanager-autoconfig/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tesla-appmanager</artifactId>
         <groupId>com.alibaba.tesla</groupId>
-        <version>1.0.8-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

paas/appmanager/tesla-appmanager-common-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tesla-appmanager</artifactId>
         <groupId>com.alibaba.tesla</groupId>
-        <version>1.0.8-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>com.alibaba.tesla</groupId>
-            <artifactId>tesla-appmanager-common</artifactId>
+            <artifactId>tesla-appmanager-util</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alibaba.tesla</groupId>

paas/appmanager/tesla-appmanager-common-service/src/main/java/com/alibaba/tesla/appmanager/common/service/impl/StreamLogServiceImpl.java

@@ -15,13 +15,10 @@
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
 
 /**
  * stream log 助手