Merge pull request #34 from cloud-barista/feature/add-mig-params

add gcpCredentialJson to migrationForm
cloud-barista · Aug 26, 2024 · 90cb38e · 90cb38e
2 parents 4cce722 + b514114
commit 90cb38e
Show file tree

Hide file tree

Showing 10 changed files with 212 additions and 66 deletions.
diff --git a/websrc/controllers/generateHandlers.go b/websrc/controllers/generateHandlers.go
@@ -183,8 +183,8 @@ func GenerateS3PostHandler(ctx echo.Context) error {
 //	@Tags			[Test Data Generation]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody		formData		GenDataParams			true	"Parameters required to generate test data"
-//	@Param			gcpCredential	formData	file					false	"Parameters required to generate test data"
+//	@Param			RequestBody		formData	GenDataParams	true	"Parameters required to generate test data"
+//	@Param			gcpCredential	formData	file			false	"Parameters required to generate test data"
 //	@Success		200				{object}	models.BasicResponse	"Successfully generated test data"
 //	@Failure		500				{object}	models.BasicResponse	"Internal Server Error"
 //	@Router			/generate/gcp [post]
@@ -483,8 +483,8 @@ func GenerateDynamoDBPostHandler(ctx echo.Context) error {
 //	@Tags			[Test Data Generation]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			GenFirestoreParams		formData		GenFirestoreParams			true	"Parameters required to generate test data"
-//	@Param			gcpCredential	formData	file					false	"Parameters required to generate test data"
+//	@Param			GenFirestoreParams	formData	GenFirestoreParams	true	"Parameters required to generate test data"
+//	@Param			gcpCredential		formData	file				false	"Parameters required to generate test data"
 //	@Success		200				{object}	models.BasicResponse	"Successfully generated test data"
 //	@Failure		500				{object}	models.BasicResponse	"Internal Server Error"
 //	@Router			/generate/firestore [post]

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

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

diff --git a/websrc/controllers/migrationNCPHandlers.go b/websrc/controllers/migrationNCPHandlers.go
@@ -204,8 +204,8 @@ func MigrationNCPToS3PostHandler(ctx echo.Context) error {
 //	@Tags			[Data Migration]
 //	@Accept			multipart/form-data
 //	@Produce		json
-//	@Param			RequestBody		formData		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 			false 	"Parameters required to generate test data"
 //	@Success		200			{object}	models.BasicResponse	"Successfully migrated data"
 //	@Failure		500			{object}	models.BasicResponse	"Internal Server Error"
 //	@Router			/migration/ncp/gcp [post]

diff --git a/websrc/controllers/migrationNoSqlHandlers.go b/websrc/controllers/migrationNoSqlHandlers.go
@@ -30,9 +30,9 @@ import (
 // @Tags [Data Migration]
 // @Accept multipart/form-data
 // @Produce json
-// @Param AWSMigrationParams formData AWSMigrationParams true "Parameters required for Linux migration"
-// @Param GCPMigrationParams formData GCPMigrationParams true "Parameters required for GCP migration"
-// @Param gcpCredential	formData file true "Parameters required to generate test data"
+// @Param AWSMigrationParams 	formData AWSMigrationParams	true  "Parameters required for Linux migration"
+// @Param GCPMigrationParams 	formData GCPMigrationParams	true  "Parameters required for GCP migration"
+// @Param gcpCredential			formData file				false "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"
 // @Router /migration/dynamodb/firestore [post]
@@ -100,8 +100,8 @@ func MigrationDynamoDBToFirestorePostHandler(ctx echo.Context) error {
 // @Tags [Data Migration]
 // @Accept json
 // @Produce json
-// @Param AWSMigrationParams body AWSMigrationParams true "Parameters required for AWS migration"
-// @Param MongoMigrationParams body MongoMigrationParams true "Parameters required for NCP migration"
+// @Param AWSMigrationParams 	body AWSMigrationParams 	true "Parameters required for AWS migration"
+// @Param MongoMigrationParams 	body MongoMigrationParams 	true "Parameters required for NCP migration"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"
 // @Router /migration/dynamodb/mongodb [post]
@@ -159,9 +159,9 @@ func MigrationDynamoDBToMongoDBPostHandler(ctx echo.Context) error {
 // @Tags [Data Migration]
 // @Accept multipart/form-data
 // @Produce json
-// @Param GCPMigrationParams formData GCPMigrationParams true "Parameters required for GCP migration"
-// @Param AWSMigrationParams formData AWSMigrationParams true "Parameters required for AWS migration"
-// @Param gcpCredential	formData file true "Parameters required to generate test data"
+// @Param GCPMigrationParams	formData GCPMigrationParams true  "Parameters required for GCP migration"
+// @Param AWSMigrationParams 	formData AWSMigrationParams true  "Parameters required for AWS migration"
+// @Param gcpCredential			formData file 				false "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"
 // @Router /migration/firestore/dynamodb [post]
@@ -229,9 +229,9 @@ func MigrationFirestoreToDynamoDBPostHandler(ctx echo.Context) error {
 // @Tags [Data Migration]
 // @Accept multipart/form-data
 // @Produce json
-// @Param GCPMigrationParams formData GCPMigrationParams true "Parameters required for GCP migration"
-// @Param MongoMigrationParams formData MongoMigrationParams true "Parameters required for NCP migration"
-// @Param gcpCredential	formData file true "Parameters required to generate test data"
+// @Param GCPMigrationParams 	formData GCPMigrationParams		true  "Parameters required for GCP migration"
+// @Param MongoMigrationParams 	formData MongoMigrationParams 	true  "Parameters required for NCP migration"
+// @Param gcpCredential			formData file				 	false "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"
 // @Router /migration/firestore/mongodb [post]
@@ -359,9 +359,9 @@ func MigrationMongoDBToDynamoDBPostHandler(ctx echo.Context) error {
 // @Tags [Data Migration]
 // @Accept multipart/form-data
 // @Produce json
-// @Param MongoMigrationParams formData MongoMigrationParams true "Parameters required for NCP migration"
-// @Param GCPMigrationParams formData GCPMigrationParams true "Parameters required for GCP migration"
-// @Param gcpCredential	formData file true "Parameters required to generate test data"
+// @Param MongoMigrationParams 	formData MongoMigrationParams 	true  "Parameters required for NCP migration"
+// @Param GCPMigrationParams 	formData GCPMigrationParams 	true  "Parameters required for GCP migration"
+// @Param gcpCredential			formData file 					false "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"
 // @Router /migration/mongodb/firestore [post]

diff --git a/websrc/controllers/migrationS3Handlers.go b/websrc/controllers/migrationS3Handlers.go
@@ -140,8 +140,8 @@ func MigrationS3ToWindowsPostHandler(ctx echo.Context) error {
 // @Tags [Data Migration]
 // @Accept multipart/form-data
 // @Produce json
-// @Param RequestBody formData 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 			false "Parameters required to generate test data"
 // @Success 200 {object} models.BasicResponse "Successfully migrated data"
 // @Failure 500 {object} models.BasicResponse "Internal Server Error"
 // @Router /migration/s3/gcp [post]

diff --git a/websrc/controllers/migrationStructs.go b/websrc/controllers/migrationStructs.go
@@ -31,7 +31,7 @@ type MigrationForm struct {
 	DatabaseID        string                `json:"databaseId" form:"databaseId"`
 	GCPRegion         string                `form:"gcpRegion" json:"gcpRegion"`
 	GCPBucket         string                `form:"gcpBucket" json:"gcpBucket"`
-	GCPCredentialJson string                `form:"gcpCredentialJson" json:"gcpCredentialJson" swaggerignore:"true"`
+	GCPCredentialJson string                `form:"gcpCredentialJson" json:"gcpCredentialJson"`
 	GCPCredential     *multipart.FileHeader `form:"gcpCredential" json:"-" swaggerignore:"true"`
 
 	NCPRegion    string `form:"ncpRegion" json:"ncpRegion"`
@@ -63,7 +63,7 @@ type GCPMigrationParams struct {
 	DatabaseID        string                `json:"databaseId" form:"databaseId"`
 	GCPRegion         string                `form:"gcpRegion" json:"gcpRegion"`
 	GCPBucket         string                `form:"gcpBucket" json:"gcpBucket"`
-	GCPCredentialJson string                `form:"gcpCredentialJson" json:"gcpCredentialJson" swaggerignore:"true"`
+	GCPCredentialJson string                `form:"gcpCredentialJson" json:"gcpCredentialJson"`
 	GCPCredential     *multipart.FileHeader `form:"gcpCredential" json:"-" swaggerignore:"true"`
 }