Merge pull request #72 from devsapp/fix-python3-http

add python3 http example can choice runtime
devsapp · Jan 20, 2023 · 12466d4 · 12466d4
2 parents 9afc7d6 + be8adb7
commit 12466d4
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 114 deletions.
diff --git a/event-function/fc-event-python3/cloudshell.md b/event-function/fc-event-python3/cloudshell.md
@@ -1,15 +1,16 @@
-# 快速体验 Python3.6 Event 函数案例
+# 快速体验 Python3 Event 函数案例
 
-欢迎您使用Serverless Devs开发者工具进行项目开发，本实验是基于Serverless Devs部署 Python3.6 Event 案例到阿里云函数计算。
+欢迎您使用Serverless Devs开发者工具进行项目开发，本实验是基于Serverless Devs部署 Python3 Event 案例到阿里云函数计算。
 
 整个实验过程包括：
-- [下载工具](#下载工具)
-- [配置密钥](#配置密钥)
-- [初始化项目](#初始化项目)
-- [部署项目](#部署项目)
-- [更多信息](#更多信息)
-
-> - [:octocat: 源代码](https://github.com/devsapp/start-fc/tree/main/event-function/fc-event-python3.6/src)
+- [快速体验 Python3 Event 函数案例](#快速体验-python3-event-函数案例)
+  - [下载工具](#下载工具)
+  - [配置密钥](#配置密钥)
+  - [初始化项目](#初始化项目)
+  - [部署项目](#部署项目)
+  - [更多信息](#更多信息)
+
+> - [:octocat: 源代码](https://github.com/devsapp/start-fc/tree/main/event-function/fc-event-python3/src)
 
 ## 下载工具
 

diff --git a/event-function/fc-event-python3/publish.yaml b/event-function/fc-event-python3/publish.yaml
@@ -1,6 +1,6 @@
 Type: Application
 Name: start-fc-event-python3
-Version: 1.1.23
+Version: 1.1.24
 Provider:
   - 阿里云
 Description: 快速部署一个 Python 3 的 Event 类型的 Hello World 函数到阿里云函数计算。
@@ -65,6 +65,6 @@ Parameters:
       default: python3.9
       description: 创建应用所在的地区
       enum:
-        - python3.6
         - python3.9
-        - python3.10
+        - python3.10
+        - python3.6
diff --git a/http-function/fc-http-python3.6/src/readme.md b/http-function/fc-http-python3.6/src/readme.md
diff --git a/...-function/fc-http-python3.6/cloudshell.md → http-function/fc-http-python3/cloudshell.md b/...-function/fc-http-python3.6/cloudshell.md → http-function/fc-http-python3/cloudshell.md
@@ -1,15 +1,16 @@
-# 快速体验 Python3.6 HTTP 函数案例
+# 快速体验 Python3 HTTP 函数案例
 
-欢迎您使用Serverless Devs开发者工具进行项目开发，本实验是基于Serverless Devs部署 Python3.6 HTTP 案例到阿里云函数计算。
+欢迎您使用Serverless Devs开发者工具进行项目开发，本实验是基于Serverless Devs部署 Python3 HTTP 案例到阿里云函数计算。
 
 整个实验过程包括：
-- [下载工具](#下载工具)
-- [配置密钥](#配置密钥)
-- [初始化项目](#初始化项目)
-- [部署项目](#部署项目)
-- [更多信息](#更多信息)
-
-> - [:octocat: 源代码](https://github.com/devsapp/start-fc/tree/main/http-function/fc-http-python3.6/src)
+- [快速体验 Python3 HTTP 函数案例](#快速体验-python3-http-函数案例)
+  - [下载工具](#下载工具)
+  - [配置密钥](#配置密钥)
+  - [初始化项目](#初始化项目)
+  - [部署项目](#部署项目)
+  - [更多信息](#更多信息)
+
+> - [:octocat: 源代码](https://github.com/devsapp/start-fc/tree/main/http-function/fc-http-python3/src)
 
 ## 下载工具
 

diff --git a/...-function/fc-http-python3.6/hook/index.js → http-function/fc-http-python3/hook/index.js b/...-function/fc-http-python3.6/hook/index.js → http-function/fc-http-python3/hook/index.js
diff --git a/http-function/fc-http-python3.6/publish.yaml → http-function/fc-http-python3/publish.yaml b/http-function/fc-http-python3.6/publish.yaml → http-function/fc-http-python3/publish.yaml
@@ -1,9 +1,9 @@
 Type: Application
 Name: start-fc-http-python3
-Version: 1.1.22
+Version: 1.1.23
 Provider:
   - 阿里云
-Description: 快速部署一个 Python 3.6 的 HTTP 类型的 Hello World 函数到阿里云函数计算。
+Description: 快速部署一个 Python 3 的 HTTP 类型的 Hello World 函数到阿里云函数计算。
 HomePage: https://github.com/devsapp/start-fc
 Tags:
   - 函数计算
@@ -22,6 +22,7 @@ Parameters:
     - region
     - serviceName
     - functionName
+    - runtime
   properties:
     region:
       title: 地域
@@ -57,4 +58,13 @@ Parameters:
       title: 函数名
       type: string
       default: start-fc-http-python3
-      description: 函数名称，只能包含字母、数字、下划线和中划线。不能以数字、中划线开头。长度在 1-64 之间
+      description: 函数名称，只能包含字母、数字、下划线和中划线。不能以数字、中划线开头。长度在 1-64 之间
+    runtime:
+      title: python 运行时
+      type: string
+      default: python3.9
+      description: 创建应用所在的地区
+      enum:
+        - python3.9
+        - python3.10
+        - python3.6
diff --git a/http-function/fc-http-python3/readme.md b/http-function/fc-http-python3/readme.md
@@ -0,0 +1 @@
+src/readme.md
diff --git a/...ction/fc-http-python3.6/src/code/index.py → ...unction/fc-http-python3/src/code/index.py b/...ction/fc-http-python3.6/src/code/index.py → ...unction/fc-http-python3/src/code/index.py
diff --git a/http-function/fc-http-python3.6/readme.md → http-function/fc-http-python3/src/readme.md b/http-function/fc-http-python3.6/readme.md → http-function/fc-http-python3/src/readme.md
@@ -14,7 +14,7 @@
 
 <description>
 
-快速部署一个 Python 3.6 的 HTTP 类型的 Hello World 函数到阿里云函数计算。
+快速部署一个 Python 3 的 HTTP 类型的 Hello World 函数到阿里云函数计算。
 
 </description>
 
@@ -33,7 +33,7 @@
 
 # 代码 & 预览
 
-- [ :smiley_cat:  源代码](https://github.com/devsapp/start-fc/blob/main/http-function/fc-http-python3.6)
+- [ :smiley_cat:  源代码](https://github.com/devsapp/start-fc/blob/main/http-function/fc-http-python3)
 
 </codepre>
 

diff --git a/http-function/fc-http-python3.6/src/s.yaml → http-function/fc-http-python3/src/s.yaml b/http-function/fc-http-python3.6/src/s.yaml → http-function/fc-http-python3/src/s.yaml
@@ -49,7 +49,7 @@ services:
       function:
         name: "{{ functionName }}"
         description: 'hello world by serverless devs'
-        runtime: python3
+        runtime: "{{ runtime }}"
         codeUri: ./code
         handler: index.handler
         memorySize: 128

diff --git a/...-function/fc-http-python3.6/src/s_en.yaml → http-function/fc-http-python3/src/s_en.yaml b/...-function/fc-http-python3.6/src/s_en.yaml → http-function/fc-http-python3/src/s_en.yaml
@@ -47,9 +47,9 @@ services:
       region: ${vars.region} # For the usage of variables, please refer to: https://www.serverless-devs.com/serverless-devs/yaml#Variable assignment
       service: ${vars.service}
       function:
-        name: custom-cpp-event-function
+        name: python-http-function
         description: 'hello world by serverless devs'
-        runtime: python3
+        runtime: python3.9
         codeUri: ./code
         handler: index.handler
         memorySize: 128

diff --git a/http-function/fc-http-python3.6/version.md → http-function/fc-http-python3/version.md b/http-function/fc-http-python3.6/version.md → http-function/fc-http-python3/version.md
diff --git a/update.list b/update.list
@@ -1 +1,2 @@
-event-function/fc-event-python3
+event-function/fc-event-python3
+http-function/fc-http-python3