Skip to content

Commit

Permalink
Merge pull request #97 from openinfradev/develop
Browse files Browse the repository at this point in the history 
release branch merge ( 20230626 )
  • Loading branch information
@ktkfree
ktkfree authored Jun 26, 2023
2 parents afefa77 + 8b30c61 commit b941a76
Show file tree
Hide file tree
Showing 7 changed files with 464 additions and 163 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build-and-push.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
branches:
- main
- develop
- release
workflow_dispatch:

env:
SERVICE: tks-api
TAG: ${{github.sha}}
Expand Down Expand Up @@ -44,6 +47,7 @@ jobs:
if [[ ${{github.ref}} == *"develop"* ]]; then
( cd cicd-manifests/${SERVICE}/overlay/development && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
elif [[ ${{github.ref}} == *"release"* ]]; then
( cd cicd-manifests/${SERVICE}/overlay/ft && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
elif [[ ${{github.ref}} == *"main"* ]]; then
( cd cicd-manifests/${SERVICE}/overlay/cicd && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: Build image
name: Build Image
on:
pull_request_target:
branches:
- main
- develop
- release

env:
SERVICE: tks-api
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: golangci-lint
name: Lint
on:
push:
tags:
- v*
branches:
- main
- develop
- "release**"
- release
pull_request:
branches:
- main
- develop
- "release**"
- release
jobs:
golangci:
name: lint
Expand Down
207 changes: 155 additions & 52 deletions api/swagger/docs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1046,13 +1046,14 @@ const docTemplate = `{
"parameters": [
{
"type": "string",
"description": "organization_Id",
"name": "organization_Id",
"in": "query"
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "show_all",
"type": "boolean",
"description": "Show all apps including deleted apps",
"name": "showAll",
"in": "query"
}
Expand Down Expand Up @@ -1088,7 +1089,14 @@ const docTemplate = `{
"summary": "Install appServeApp",
"parameters": [
{
"description": "create appserve request",
"type": "string",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"description": "Request body to create app",
"name": "object",
"in": "body",
"required": true,
Expand All @@ -1107,34 +1115,6 @@ const docTemplate = `{
}
}
},
"/organizations/{organizationId}/app-serve-apps/app-id/exist": {
"get": {
"security": [
{
"JWT": []
}
],
"description": "Get appServeApp by giving params",
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"tags": [
"AppServeApps"
],
"summary": "Get appServeApp",
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "boolean"
}
}
}
}
},
"/organizations/{organizationId}/app-serve-apps/count": {
"get": {
"security": [
Expand All @@ -1153,6 +1133,22 @@ const docTemplate = `{
"AppServeApps"
],
"summary": "Get number of apps on given stack",
"parameters": [
{
"type": "string",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "Stack ID",
"name": "stackId",
"in": "query",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
Expand Down Expand Up @@ -1184,7 +1180,7 @@ const docTemplate = `{
"parameters": [
{
"type": "string",
"description": "organizationId",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
Expand Down Expand Up @@ -1225,6 +1221,22 @@ const docTemplate = `{
"AppServeApps"
],
"summary": "Get appServeApp",
"parameters": [
{
"type": "string",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "App ID",
"name": "appId",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
Expand Down Expand Up @@ -1253,7 +1265,21 @@ const docTemplate = `{
"summary": "Update appServeApp",
"parameters": [
{
"description": "update appserve request",
"type": "string",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "App ID",
"name": "appId",
"in": "path",
"required": true
},
{
"description": "Request body to update app",
"name": "object",
"in": "body",
"required": true,
Expand All @@ -1266,7 +1292,7 @@ const docTemplate = `{
"200": {
"description": "OK",
"schema": {
"type": "object"
"type": "string"
}
}
}
Expand All @@ -1290,20 +1316,25 @@ const docTemplate = `{
"summary": "Uninstall appServeApp",
"parameters": [
{
"description": "body",
"name": "object",
"in": "body",
"required": true,
"schema": {
"type": "string"
}
"type": "string",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "App ID",
"name": "appId",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "object"
"type": "string"
}
}
}
Expand All @@ -1328,6 +1359,13 @@ const docTemplate = `{
],
"summary": "Update app endpoint",
"parameters": [
{
"type": "string",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "appId",
Expand All @@ -1336,7 +1374,7 @@ const docTemplate = `{
"required": true
},
{
"description": "update app endpoint request",
"description": "Request body to update app endpoint",
"name": "body",
"in": "body",
"required": true,
Expand All @@ -1349,7 +1387,35 @@ const docTemplate = `{
"200": {
"description": "OK",
"schema": {
"type": "object"
"type": "string"
}
}
}
}
},
"/organizations/{organizationId}/app-serve-apps/{appId}/exist": {
"get": {
"security": [
{
"JWT": []
}
],
"description": "Get appServeApp by giving params",
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"tags": [
"AppServeApps"
],
"summary": "Get appServeApp",
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "boolean"
}
}
}
Expand All @@ -1373,6 +1439,22 @@ const docTemplate = `{
"AppServeApps"
],
"summary": "Get latest task from appServeApp",
"parameters": [
{
"type": "string",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "App ID",
"name": "appId",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
Expand Down Expand Up @@ -1403,7 +1485,21 @@ const docTemplate = `{
"summary": "Rollback appServeApp",
"parameters": [
{
"description": "rollback appserve request",
"type": "string",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "App ID",
"name": "appId",
"in": "path",
"required": true
},
{
"description": "Request body to rollback app",
"name": "object",
"in": "body",
"required": true,
Expand All @@ -1416,7 +1512,7 @@ const docTemplate = `{
"200": {
"description": "OK",
"schema": {
"type": "object"
"type": "string"
}
}
}
Expand All @@ -1443,13 +1539,20 @@ const docTemplate = `{
"parameters": [
{
"type": "string",
"description": "appId",
"description": "Organization ID",
"name": "organizationId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "App ID",
"name": "appId",
"in": "path",
"required": true
},
{
"description": "update app status request",
"description": "Request body to update app status",
"name": "body",
"in": "body",
"required": true,
Expand All @@ -1462,7 +1565,7 @@ const docTemplate = `{
"200": {
"description": "OK",
"schema": {
"type": "object"
"type": "string"
}
}
}
Expand Down
Loading

0 comments on commit b941a76

Please sign in to comment.