Merge pull request #22 from cloud-barista/feature/update-mig-structure

update : gcp structure
cloud-barista · Aug 22, 2024 · 1740fb7 · 1740fb7
2 parents d8b9a48 + cf052c3
commit 1740fb7
Show file tree

Hide file tree

Showing 12 changed files with 3,667 additions and 355 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ default:
 # cc:
 # 	cd cmd/cm-beetle && $(MAKE)
 run:
-	./mc-data-manager server
+	./mc-data-manager server -I 0.0.0.0/0 -P 80
 # runwithport:
 # 	cd cmd/cm-beetle && $(MAKE) runwithport --port=$(PORT)
 clean:

diff --git a/websrc/controllers/generateHandlers.go b/websrc/controllers/generateHandlers.go
@@ -183,7 +183,7 @@ func GenerateS3PostHandler(ctx echo.Context) error {
 //	@Tags			[Test Data Generation]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody		body		GenDataParams			true	"Parameters required to generate test data"
+//	@Param			RequestBody		formData		GenDataParams			true	"Parameters required to generate test data"
 //	@Param			gcpCredential	formData	file					true	"Parameters required to generate test data"
 //	@Success		200				{object}	models.BasicResponse	"Successfully generated test data"
 //	@Failure		500				{object}	models.BasicResponse	"Internal Server Error"
@@ -483,7 +483,7 @@ func GenerateDynamoDBPostHandler(ctx echo.Context) error {
 //	@Tags			[Test Data Generation]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody		body		GenDataParams			true	"Parameters required to generate test data"
+//	@Param			RequestBody		formData		GenDataParams			true	"Parameters required to generate test data"
 //	@Param			gcpCredential	formData	file					true	"Parameters required to generate test data"
 //	@Success		200				{object}	models.BasicResponse	"Successfully generated test data"
 //	@Failure		500				{object}	models.BasicResponse	"Internal Server Error"

diff --git a/websrc/controllers/migrationGCPHandlers.go b/websrc/controllers/migrationGCPHandlers.go
@@ -31,7 +31,7 @@ import (
 //	@Tags			[Data Migration]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody	body		MigrationForm			true	"Parameters required for migration"
+//	@Param			RequestBody	formData		MigrationForm			true	"Parameters required for migration"
 //	@Param			gcpCredential	formData	file					true	"Parameters required to generate test data"
 //	@Success		200			{object}	models.BasicResponse	"Successfully migrated data"
 //	@Failure		400			{object}	models.BasicResponse	"Invalid Request"
@@ -97,7 +97,7 @@ func MigrationGCPToLinuxPostHandler(ctx echo.Context) error {
 //	@Tags			[Data Migration]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody	body		MigrationForm			true	"Parameters required for migration"
+//	@Param			RequestBody	formData		MigrationForm			true	"Parameters required for migration"
 //	@Param			gcpCredential	formData	file					true	"Parameters required to generate test data"
 //	@Success		200			{object}	models.BasicResponse	"Successfully migrated data"
 //	@Failure		400			{object}	models.BasicResponse	"Invalid Request"
@@ -163,7 +163,7 @@ func MigrationGCPToWindowsPostHandler(ctx echo.Context) error {
 //	@Tags			[Data Migration]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody	body		MigrationForm			true	"Parameters required for migration"
+//	@Param			RequestBody	formData		MigrationForm			true	"Parameters required for migration"
 //	@Param			gcpCredential	formData	file					true	"Parameters required to generate test data"
 //	@Success		200			{object}	models.BasicResponse	"Successfully migrated data"
 //	@Failure		500			{object}	models.BasicResponse	"Internal Server Error"
@@ -234,7 +234,7 @@ func MigrationGCPToS3PostHandler(ctx echo.Context) error {
 //	@Tags			[Data Migration]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody	body		MigrationForm			true	"Parameters required for migration"
+//	@Param			RequestBody	formData		MigrationForm			true	"Parameters required for migration"
 //	@Param			gcpCredential	formData	file					true	"Parameters required to generate test data"
 //	@Success		200			{object}	models.BasicResponse	"Successfully migrated data"
 //	@Failure		500			{object}	models.BasicResponse	"Internal Server Error"

diff --git a/websrc/controllers/migrationHandlers.go b/websrc/controllers/migrationHandlers.go
@@ -86,7 +86,7 @@ func MigrationLinuxToS3PostHandler(ctx echo.Context) error {
 //	@Tags			[Data Migration]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody	body		MigrationForm			true	"Parameters required for migration"
+//	@Param			RequestBody	formData		MigrationForm			true	"Parameters required for migration"
 //	@Param			gcpCredential	formData	file					true	"Parameters required to generate test data"
 //	@Success		200			{object}	models.BasicResponse	"Successfully migrated data"
 //	@Failure		400			{object}	models.BasicResponse	"Invalid Request"
@@ -273,7 +273,7 @@ func MigrationWindowsToS3PostHandler(ctx echo.Context) error {
 //	@Tags			[Data Migration]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody	body		MigrationForm			true	"Parameters required for migration"
+//	@Param			RequestBody	formData		MigrationForm			true	"Parameters required for migration"
 //	@Param			gcpCredential	formData	file					true	"Parameters required to generate test data"
 //	@Success		200			{object}	models.BasicResponse	"Successfully migrated data"
 //	@Failure		400			{object}	models.BasicResponse	"Invalid Request"

diff --git a/websrc/controllers/migrationNCPHandlers.go b/websrc/controllers/migrationNCPHandlers.go
@@ -203,8 +203,8 @@ func MigrationNCPToS3PostHandler(ctx echo.Context) error {
 //	@Tags			[Data Migration]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody	body		MigrationForm			true	"Parameters required for migration"
-//	@Param gcpCredential	formData file true "Parameters required to generate test data"
+//	@Param			RequestBody		formData		MigrationForm			true	"Parameters required for migration"
+//	@Param 			gcpCredential	formData 		file 					true 	"Parameters required to generate test data"
 //	@Success		200			{object}	models.BasicResponse	"Successfully migrated data"
 //	@Failure		500			{object}	models.BasicResponse	"Internal Server Error"
 //	@Router			/ncp/gcp [post]

diff --git a/websrc/controllers/migrationNoSqlHandlers.go b/websrc/controllers/migrationNoSqlHandlers.go
@@ -30,7 +30,7 @@ import (
 // @Tags [Data Migration]
 // @Accept multipart/form-data
 // @Produce json
-// @Param RequestBody body MigrationForm true "Parameters required for migration"
+// @Param RequestBody formData MigrationForm true "Parameters required for migration"
 // @Param gcpCredential	formData file true "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"
@@ -156,9 +156,9 @@ func MigrationDynamoDBToMongoDBPostHandler(ctx echo.Context) error {
 // @Summary Migrate data from Firestore to DynamoDB
 // @Description Migrate data stored in Google Cloud Firestore to AWS DynamoDB.
 // @Tags [Data Migration]
-// @Accept json
+// @Accept multipart/form-data
 // @Produce json
-// @Param RequestBody body MigrationForm true "Parameters required for migration"
+// @Param RequestBody formData MigrationForm true "Parameters required for migration"
 // @Param gcpCredential	formData file true "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"
@@ -225,9 +225,9 @@ func MigrationFirestoreToDynamoDBPostHandler(ctx echo.Context) error {
 // @Summary Migrate data from Firestore to MongoDB
 // @Description Migrate data stored in Google Cloud Firestore to Naver Cloud MongoDB.
 // @Tags [Data Migration]
-// @Accept json
+// @Accept multipart/form-data
 // @Produce json
-// @Param RequestBody body MigrationForm true "Parameters required for migration"
+// @Param RequestBody formData MigrationForm true "Parameters required for migration"
 // @Param gcpCredential	formData file true "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"
@@ -353,9 +353,9 @@ func MigrationMongoDBToDynamoDBPostHandler(ctx echo.Context) error {
 // @Summary Migrate data from MongoDB to Firestore
 // @Description Migrate data stored in Naver Cloud MongoDB to Google Cloud Firestore.
 // @Tags [Data Migration]
-// @Accept json
+// @Accept multipart/form-data
 // @Produce json
-// @Param RequestBody body MigrationForm true "Parameters required for migration"
+// @Param RequestBody formData MigrationForm true "Parameters required for migration"
 // @Param gcpCredential	formData file true "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"

diff --git a/websrc/controllers/migrationS3Handlers.go b/websrc/controllers/migrationS3Handlers.go
@@ -140,7 +140,7 @@ func MigrationS3ToWindowsPostHandler(ctx echo.Context) error {
 // @Tags [Data Migration]
 // @Accept multipart/form-data
 // @Produce json
-// @Param RequestBody body MigrationForm true "Parameters required for migration"
+// @Param RequestBody formData MigrationForm true "Parameters required for migration"
 // @Param gcpCredential	formData file true "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"

diff --git a/websrc/controllers/migrationStructs.go b/websrc/controllers/migrationStructs.go
@@ -27,7 +27,10 @@ type MigrationForm struct {
 	AWSSecretKey string `form:"awsSecretKey"`
 	AWSBucket    string `form:"awsBucket"`
 
-	GCPParams GCPMigrationParams `json:"gcpParams"`
+	ProjectID     string                `form:"projectid" json:"projectid"`
+	GCPRegion     string                `form:"gcpRegion" json:"gcpRegion"`
+	GCPBucket     string                `form:"gcpBucket" json:"gcpBucket"`
+	GCPCredential *multipart.FileHeader `form:"gcpCredential" json:"-" swaggerignore:"true"`
 
 	NCPRegion    string `form:"ncpRegion"`
 	NCPAccessKey string `form:"ncpAccessKey"`

diff --git a/websrc/controllers/publicfunc.go b/websrc/controllers/publicfunc.go
@@ -215,7 +215,7 @@ func getGCPCOSC(logger *logrus.Logger, startTime time.Time, jobType string, para
 	if jobType == "gen" {
 		gcpOSC, err = osc.New(gcpfs.New(gc, gparam.ProjectID, gparam.Bucket, gparam.Region), osc.WithLogger(logger))
 	} else {
-		gcpOSC, err = osc.New(gcpfs.New(gc, mparam.GCPParams.ProjectID, mparam.GCPParams.GCPBucket, mparam.GCPParams.GCPRegion), osc.WithLogger(logger))
+		gcpOSC, err = osc.New(gcpfs.New(gc, mparam.ProjectID, mparam.GCPBucket, mparam.GCPRegion), osc.WithLogger(logger))
 	}
 	if err != nil {
 		end := time.Now()
@@ -328,7 +328,7 @@ func getFirestoreNRDBC(logger *logrus.Logger, startTime time.Time, jobType strin
 	if jobType == "gen" {
 		fc, err = config.NewFireStoreClient(credFileName, gparam.ProjectID)
 	} else {
-		fc, err = config.NewFireStoreClient(credFileName, mparam.GCPParams.ProjectID)
+		fc, err = config.NewFireStoreClient(credFileName, mparam.ProjectID)
 	}
 	if err != nil {
 		end := time.Now()
@@ -342,7 +342,7 @@ func getFirestoreNRDBC(logger *logrus.Logger, startTime time.Time, jobType strin
 	if jobType == "gen" {
 		NRDBC, err = nrdbc.New(gcpfsdb.New(fc, gparam.Region), nrdbc.WithLogger(logger))
 	} else {
-		NRDBC, err = nrdbc.New(gcpfsdb.New(fc, mparam.GCPParams.GCPRegion), nrdbc.WithLogger(logger))
+		NRDBC, err = nrdbc.New(gcpfsdb.New(fc, mparam.GCPRegion), nrdbc.WithLogger(logger))
 	}
 	if err != nil {
 		end := time.Now()