Skip to content

Commit 802b546

Browse files
authored
Merge pull request #155 from yunkon-kim/250417-10
Update VPN info for output
2 parents f708da0 + 1228fa8 commit 802b546

File tree

7 files changed

+294
-153
lines changed

7 files changed

+294
-153
lines changed

api/docs.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3906,7 +3906,7 @@ const docTemplate = `{
39063906
"type": "object",
39073907
"properties": {
39083908
"tfVars": {
3909-
"$ref": "#/definitions/model.TfVarsMessageBroker"
3909+
"$ref": "#/definitions/model.TfVarsObjectStorage"
39103910
}
39113911
}
39123912
},
@@ -4199,6 +4199,23 @@ const docTemplate = `{
41994199
}
42004200
}
42014201
},
4202+
"model.TfVarsObjectStorage": {
4203+
"type": "object",
4204+
"properties": {
4205+
"csp_region": {
4206+
"type": "string",
4207+
"example": "ap-northeast-2"
4208+
},
4209+
"csp_resource_group": {
4210+
"type": "string",
4211+
"example": "koreacentral"
4212+
},
4213+
"terrarium_id": {
4214+
"type": "string",
4215+
"example": ""
4216+
}
4217+
}
4218+
},
42024219
"model.TfVarsSqlDb": {
42034220
"type": "object",
42044221
"properties": {

api/swagger.json

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3900,7 +3900,7 @@
39003900
"type": "object",
39013901
"properties": {
39023902
"tfVars": {
3903-
"$ref": "#/definitions/model.TfVarsMessageBroker"
3903+
"$ref": "#/definitions/model.TfVarsObjectStorage"
39043904
}
39053905
}
39063906
},
@@ -4193,6 +4193,23 @@
41934193
}
41944194
}
41954195
},
4196+
"model.TfVarsObjectStorage": {
4197+
"type": "object",
4198+
"properties": {
4199+
"csp_region": {
4200+
"type": "string",
4201+
"example": "ap-northeast-2"
4202+
},
4203+
"csp_resource_group": {
4204+
"type": "string",
4205+
"example": "koreacentral"
4206+
},
4207+
"terrarium_id": {
4208+
"type": "string",
4209+
"example": ""
4210+
}
4211+
}
4212+
},
41964213
"model.TfVarsSqlDb": {
41974214
"type": "object",
41984215
"properties": {

api/swagger.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ definitions:
8383
model.CreateInfracodeOfObjectStorageRequest:
8484
properties:
8585
tfVars:
86-
$ref: '#/definitions/model.TfVarsMessageBroker'
86+
$ref: '#/definitions/model.TfVarsObjectStorage'
8787
type: object
8888
model.CreateInfracodeOfSqlDbRequest:
8989
properties:
@@ -293,6 +293,18 @@ definitions:
293293
example: ""
294294
type: string
295295
type: object
296+
model.TfVarsObjectStorage:
297+
properties:
298+
csp_region:
299+
example: ap-northeast-2
300+
type: string
301+
csp_resource_group:
302+
example: koreacentral
303+
type: string
304+
terrarium_id:
305+
example: ""
306+
type: string
307+
type: object
296308
model.TfVarsSqlDb:
297309
properties:
298310
csp_region:

docker-compose.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ services:
1616
published: 8055
1717
protocol: tcp
1818
env_file:
19-
- ./secrets/credentials # AWS credentials
20-
- ./secrets/credential-azure.env # Azure credentials
21-
- ./secrets/credential-ncp.env # NCP credentials
22-
- ./secrets/credential-ibm.env # IBM credentials
19+
- ./secrets/credentials # AWS credential
20+
- ./secrets/credential-azure.env # Azure credential
21+
- ./secrets/credential-alibaba.env # Alibaba credential
22+
- ./secrets/credential-tencent.env # Tencent credential
23+
- ./secrets/credential-ibm.env # IBM credential
24+
- ./secrets/credential-ncp.env # NCP credential
2325
volumes:
24-
- ./secrets:/app/secrets:ro # GCP credentials
26+
- ./secrets/credential-gcp.json:/app/secrets/credential-gcp.json:ro # GCP credential
2527
- ./container-volume/mc-terrarium-container/.terrarium:/app/.terrarium
2628
environment:
2729
- TERRARIUM_ROOT=/app

0 commit comments

Comments
 (0)