Skip to content

Commit 4fd55c8

Browse files
yunkon-kimyunkon-kim
authored
Merge pull request #152 from yunkon-kim/250408-demo
Modularize and enhance AWS-to-site VPN
2 parents 1368e73 + d6330d5 commit 4fd55c8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1131
-790
lines changed

‎api/docs.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,7 @@ const docTemplate = `{
17661766
"parameters": [
17671767
{
17681768
"type": "string",
1769-
"default": "tr01",
1769+
"default": "testbed01",
17701770
"description": "Terrarium ID",
17711771
"name": "trId",
17721772
"in": "path",
@@ -1832,7 +1832,7 @@ const docTemplate = `{
18321832
"parameters": [
18331833
{
18341834
"type": "string",
1835-
"default": "tr01",
1835+
"default": "testbed01",
18361836
"description": "Terrarium ID",
18371837
"name": "trId",
18381838
"in": "path",
@@ -1896,7 +1896,7 @@ const docTemplate = `{
18961896
"parameters": [
18971897
{
18981898
"type": "string",
1899-
"default": "tr01",
1899+
"default": "testbed01",
19001900
"description": "Terrarium ID",
19011901
"name": "trId",
19021902
"in": "path",
@@ -1953,7 +1953,7 @@ const docTemplate = `{
19531953
"parameters": [
19541954
{
19551955
"type": "string",
1956-
"default": "tr01",
1956+
"default": "testbed01",
19571957
"description": "Terrarium ID",
19581958
"name": "trId",
19591959
"in": "path",
@@ -2010,7 +2010,7 @@ const docTemplate = `{
20102010
"parameters": [
20112011
{
20122012
"type": "string",
2013-
"default": "tr01",
2013+
"default": "testbed01",
20142014
"description": "Terrarium ID",
20152015
"name": "trId",
20162016
"in": "path",
@@ -2067,7 +2067,7 @@ const docTemplate = `{
20672067
"parameters": [
20682068
{
20692069
"type": "string",
2070-
"default": "tr01",
2070+
"default": "testbed01",
20712071
"description": "Terrarium ID",
20722072
"name": "trId",
20732073
"in": "path",
@@ -2124,7 +2124,7 @@ const docTemplate = `{
21242124
"parameters": [
21252125
{
21262126
"type": "string",
2127-
"default": "tr01",
2127+
"default": "testbed01",
21282128
"description": "Terrarium ID",
21292129
"name": "trId",
21302130
"in": "path",
@@ -2190,7 +2190,7 @@ const docTemplate = `{
21902190
"parameters": [
21912191
{
21922192
"type": "string",
2193-
"default": "tr01",
2193+
"default": "testbed01",
21942194
"description": "Terrarium ID",
21952195
"name": "trId",
21962196
"in": "path",
@@ -2258,7 +2258,7 @@ const docTemplate = `{
22582258
"parameters": [
22592259
{
22602260
"type": "string",
2261-
"default": "tr01",
2261+
"default": "testbed01",
22622262
"description": "Terrarium ID",
22632263
"name": "trId",
22642264
"in": "path",

‎api/swagger.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1760,7 +1760,7 @@
17601760
"parameters": [
17611761
{
17621762
"type": "string",
1763-
"default": "tr01",
1763+
"default": "testbed01",
17641764
"description": "Terrarium ID",
17651765
"name": "trId",
17661766
"in": "path",
@@ -1826,7 +1826,7 @@
18261826
"parameters": [
18271827
{
18281828
"type": "string",
1829-
"default": "tr01",
1829+
"default": "testbed01",
18301830
"description": "Terrarium ID",
18311831
"name": "trId",
18321832
"in": "path",
@@ -1890,7 +1890,7 @@
18901890
"parameters": [
18911891
{
18921892
"type": "string",
1893-
"default": "tr01",
1893+
"default": "testbed01",
18941894
"description": "Terrarium ID",
18951895
"name": "trId",
18961896
"in": "path",
@@ -1947,7 +1947,7 @@
19471947
"parameters": [
19481948
{
19491949
"type": "string",
1950-
"default": "tr01",
1950+
"default": "testbed01",
19511951
"description": "Terrarium ID",
19521952
"name": "trId",
19531953
"in": "path",
@@ -2004,7 +2004,7 @@
20042004
"parameters": [
20052005
{
20062006
"type": "string",
2007-
"default": "tr01",
2007+
"default": "testbed01",
20082008
"description": "Terrarium ID",
20092009
"name": "trId",
20102010
"in": "path",
@@ -2061,7 +2061,7 @@
20612061
"parameters": [
20622062
{
20632063
"type": "string",
2064-
"default": "tr01",
2064+
"default": "testbed01",
20652065
"description": "Terrarium ID",
20662066
"name": "trId",
20672067
"in": "path",
@@ -2118,7 +2118,7 @@
21182118
"parameters": [
21192119
{
21202120
"type": "string",
2121-
"default": "tr01",
2121+
"default": "testbed01",
21222122
"description": "Terrarium ID",
21232123
"name": "trId",
21242124
"in": "path",
@@ -2184,7 +2184,7 @@
21842184
"parameters": [
21852185
{
21862186
"type": "string",
2187-
"default": "tr01",
2187+
"default": "testbed01",
21882188
"description": "Terrarium ID",
21892189
"name": "trId",
21902190
"in": "path",
@@ -2252,7 +2252,7 @@
22522252
"parameters": [
22532253
{
22542254
"type": "string",
2255-
"default": "tr01",
2255+
"default": "testbed01",
22562256
"description": "Terrarium ID",
22572257
"name": "trId",
22582258
"in": "path",

‎api/swagger.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,7 +1520,7 @@ paths:
15201520
- application/json
15211521
description: Delete the testbed
15221522
parameters:
1523-
- default: tr01
1523+
- default: testbed01
15241524
description: Terrarium ID
15251525
in: path
15261526
name: trId
@@ -1557,7 +1557,7 @@ paths:
15571557
- application/json
15581558
description: Get the testbed
15591559
parameters:
1560-
- default: tr01
1560+
- default: testbed01
15611561
description: Terrarium ID
15621562
in: path
15631563
name: trId
@@ -1602,7 +1602,7 @@ paths:
16021602
- application/json
16031603
description: Create the testbed
16041604
parameters:
1605-
- default: tr01
1605+
- default: testbed01
16061606
description: Terrarium ID
16071607
in: path
16081608
name: trId
@@ -1646,7 +1646,7 @@ paths:
16461646
- application/json
16471647
description: Apply the testbed
16481648
parameters:
1649-
- default: tr01
1649+
- default: testbed01
16501650
description: Terrarium ID
16511651
in: path
16521652
name: trId
@@ -1684,7 +1684,7 @@ paths:
16841684
- application/json
16851685
description: Destroy the testbed
16861686
parameters:
1687-
- default: tr01
1687+
- default: testbed01
16881688
description: Terrarium ID
16891689
in: path
16901690
name: trId
@@ -1722,7 +1722,7 @@ paths:
17221722
- application/json
17231723
description: EmptyOut the testbed
17241724
parameters:
1725-
- default: tr01
1725+
- default: testbed01
17261726
description: Terrarium ID
17271727
in: path
17281728
name: trId
@@ -1760,7 +1760,7 @@ paths:
17601760
- application/json
17611761
description: Init testbed
17621762
parameters:
1763-
- default: tr01
1763+
- default: testbed01
17641764
description: Terrarium ID
17651765
in: path
17661766
name: trId
@@ -1804,7 +1804,7 @@ paths:
18041804
- application/json
18051805
description: Output the testbed
18061806
parameters:
1807-
- default: tr01
1807+
- default: testbed01
18081808
description: Terrarium ID
18091809
in: path
18101810
name: trId
@@ -1850,7 +1850,7 @@ paths:
18501850
- application/json
18511851
description: Plan the testbed
18521852
parameters:
1853-
- default: tr01
1853+
- default: testbed01
18541854
description: Terrarium ID
18551855
in: path
18561856
name: trId

‎pkg/api/rest/handler/testbed-actions.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
// @Tags [Testbed] OpenTofu Actions (for fine-grained contorl)
2525
// @Accept json
2626
// @Produce json
27-
// @Param trId path string true "Terrarium ID" default(tr01)
27+
// @Param trId path string true "Terrarium ID" default(testbed01)
2828
// @Param ReqBody body model.CreateTestbedRequest true "Parameters requied to create a testbed"
2929
// @Param x-request-id header string false "Custom request ID"
3030
// @Success 201 {object} model.Response "Created"
@@ -143,11 +143,11 @@ func initTestbed(c echo.Context) (model.Response, error) {
143143
return emptyRes, err
144144
}
145145

146-
err = terrarium.SetCredentials(trId, enrichments, "azure")
147-
if err != nil {
148-
log.Error().Err(err).Msg(err.Error())
149-
return emptyRes, err
150-
}
146+
// err = terrarium.SetCredentials(trId, enrichments, "azure")
147+
// if err != nil {
148+
// log.Error().Err(err).Msg(err.Error())
149+
// return emptyRes, err
150+
// }
151151

152152
// Set the tfvars
153153
err = terrarium.SaveTfVars(trId, enrichments, req.TestbedConfig)
@@ -185,7 +185,7 @@ func initTestbed(c echo.Context) (model.Response, error) {
185185
// @Tags [Testbed] OpenTofu Actions (for fine-grained contorl)
186186
// @Accept json
187187
// @Produce json
188-
// @Param trId path string true "Terrarium ID" default(tr01)
188+
// @Param trId path string true "Terrarium ID" default(testbed01)
189189
// @Param x-request-id header string false "Custom request ID"
190190
// @Success 200 {object} model.Response "OK"
191191
// @Failure 400 {object} model.Response "Bad Request"
@@ -243,7 +243,7 @@ func planTestbed(c echo.Context) (model.Response, error) {
243243
// @Tags [Testbed] OpenTofu Actions (for fine-grained contorl)
244244
// @Accept json
245245
// @Produce json
246-
// @Param trId path string true "Terrarium ID" default(tr01)
246+
// @Param trId path string true "Terrarium ID" default(testbed01)
247247
// @Param x-request-id header string false "Custom request ID"
248248
// @Success 201 {object} model.Response "Created"
249249
// @Failure 400 {object} model.Response "Bad Request"
@@ -301,7 +301,7 @@ func applyTestbed(c echo.Context) (model.Response, error) {
301301
// @Tags [Testbed] OpenTofu Actions (for fine-grained contorl)
302302
// @Accept json
303303
// @Produce json
304-
// @Param trId path string true "Terrarium ID" default(tr01)
304+
// @Param trId path string true "Terrarium ID" default(testbed01)
305305
// @Param x-request-id header string false "Custom request ID"
306306
// @Success 200 {object} model.Response "OK"
307307
// @Failure 400 {object} model.Response "Bad Request"
@@ -359,7 +359,7 @@ func destroyTestbed(c echo.Context) (model.Response, error) {
359359
// @Tags [Testbed] OpenTofu Actions (for fine-grained contorl)
360360
// @Accept json
361361
// @Produce json
362-
// @Param trId path string true "Terrarium ID" default(tr01)
362+
// @Param trId path string true "Terrarium ID" default(testbed01)
363363
// @Param detail query string false "Resource info by detail (refined, raw)" Enums(refined, raw) default(refined)
364364
// @Param x-request-id header string false "Custom request ID"
365365
// @Success 200 {object} model.Response "OK"
@@ -588,7 +588,7 @@ func outputTestbed(c echo.Context) (model.Response, error) {
588588
// @Tags [Testbed] OpenTofu Actions (for fine-grained contorl)
589589
// @Accept json
590590
// @Produce json
591-
// @Param trId path string true "Terrarium ID" default(tr01)
591+
// @Param trId path string true "Terrarium ID" default(testbed01)
592592
// @Param x-request-id header string false "Custom request ID"
593593
// @Success 200 {object} model.Response "OK"
594594
// @Failure 400 {object} model.Response "Bad Request"

‎pkg/api/rest/handler/testbed.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
// @Tags [Testbed] Resource Operations
1818
// @Accept json
1919
// @Produce json
20-
// @Param trId path string true "Terrarium ID" default(tr01)
20+
// @Param trId path string true "Terrarium ID" default(testbed01)
2121
// @Param ReqBody body model.CreateTestbedRequest true "Parameters requied to create a testbed"
2222
// @Param x-request-id header string false "Custom request ID"
2323
// @Success 201 {object} model.Response "Created"
@@ -59,7 +59,7 @@ func CreateTestbed(c echo.Context) error {
5959
// @Tags [Testbed] Resource Operations
6060
// @Accept json
6161
// @Produce json
62-
// @Param trId path string true "Terrarium ID" default(tr01)
62+
// @Param trId path string true "Terrarium ID" default(testbed01)
6363
// @Param detail query string false "Resource info by detail (refined, raw)" Enums(refined, raw) default(refined)
6464
// @Param x-request-id header string false "Custom request ID"
6565
// @Success 200 {object} model.Response "OK"
@@ -87,7 +87,7 @@ func GetTestbed(c echo.Context) error {
8787
// @Tags [Testbed] Resource Operations
8888
// @Accept json
8989
// @Produce json
90-
// @Param trId path string true "Terrarium ID" default(tr01)
90+
// @Param trId path string true "Terrarium ID" default(testbed01)
9191
// @Param x-request-id header string false "Custom request ID"
9292
// @Success 200 {object} model.Response "OK"
9393
// @Failure 400 {object} model.Response "Bad Request"

0 commit comments

Comments
 (0)