Refactored to use Terraform

Author: acidcoder1

cmd/deploy.go

@@ -4,19 +4,20 @@ import (
 	"fmt"
 
 	"github.com/codeupify/upify/internal/config"
-	"github.com/codeupify/upify/internal/platform/aws/lambda"
-	"github.com/codeupify/upify/internal/platform/gcp/cloudrun"
+	"github.com/codeupify/upify/internal/platform"
+	"github.com/codeupify/upify/internal/platform/aws"
+	"github.com/codeupify/upify/internal/platform/gcp"
 	"github.com/spf13/cobra"
 )
 
 var deployCmd = &cobra.Command{
 	Use:   "deploy [platform]",
 	Short: "Deploy the application to a specified platform",
 	Long: `Deploy the application to a specified platform.
-Currently supported platforms: aws-lambda, gcp-cloudrun
+Currently supported platforms: aws, gcp
 
 Example:
-  upify deploy aws-lambda`,
+  upify deploy aws`,
 	Args: cobra.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		platform := args[0]
@@ -33,26 +34,20 @@ func init() {
 	rootCmd.AddCommand(deployCmd)
 }
 
-func deploy(platform string, cfg *config.Config) error {
-	switch platform {
-	case "aws-lambda":
-		if cfg.AWSLambda == nil {
-			return fmt.Errorf("aws-lambda configuration is not set up. Please run 'upify platform add aws-lambda' first")
+func deploy(platformStr string, cfg *config.Config) error {
+	switch platformStr {
+	case string(platform.AWS):
+		fmt.Println("Deploying to AWS...")
+		if err := aws.Deploy(cfg); err != nil {
+			return fmt.Errorf("failed to deploy to AWS: %w", err)
 		}
-		fmt.Println("Deploying to AWS Lambda...")
-		if err := lambda.Deploy(cfg); err != nil {
-			return fmt.Errorf("failed to deploy to AWS Lambda: %w", err)
-		}
-	case "gcp-cloudrun":
-		if cfg.GCPCloudRun == nil {
-			return fmt.Errorf("gcp-cloudrun configuration is not set up. Please run 'upify platform add gcp-cloudrun' first")
-		}
-		fmt.Println("Deploying to GCP Cloud Run...")
-		if err := cloudrun.Deploy(cfg); err != nil {
-			return fmt.Errorf("failed to deploy to GCP Cloud Run: %w", err)
+	case string(platform.GCP):
+		fmt.Println("Deploying to GCP...")
+		if err := gcp.Deploy(cfg); err != nil {
+			return fmt.Errorf("failed to deploy to GCP: %w", err)
 		}
 	default:
-		return fmt.Errorf("unsupported platform: %s", platform)
+		return fmt.Errorf("unsupported platform: %s", platformStr)
 	}
 
 	return nil

cmd/init.go

@@ -10,7 +10,7 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/codeupify/upify/internal/config"
 	"github.com/codeupify/upify/internal/framework"
-	"github.com/codeupify/upify/internal/handler"
+	"github.com/codeupify/upify/internal/infra"
 	"github.com/codeupify/upify/internal/lang"
 	"github.com/spf13/cobra"
 )
@@ -120,12 +120,12 @@ var initCmd = &cobra.Command{
 			AppVar:         appVar,
 		}
 
-		if err := handler.AddHandlerFile(cfg); err != nil {
+		if err := infra.AddHandlerFile(cfg); err != nil {
 			return err
 		}
 
 		if entrypoint == "" {
-			if err := handler.AddMainFile(cfg); err != nil {
+			if err := infra.AddMainFile(cfg); err != nil {
 				return err
 			}
 		}
@@ -134,10 +134,15 @@ var initCmd = &cobra.Command{
 			return fmt.Errorf("failed to save configuration: %w", err)
 		}
 
+		err = infra.AddEnvironmentFile()
+		if err != nil {
+			return err
+		}
+
 		fmt.Println("Done!")
 
 		if entrypoint == "" {
-			mainPath := handler.GetMainPath(selectedLanguage)
+			mainPath := infra.GetMainPath(selectedLanguage)
 			fmt.Printf("\n\033[1mImportant!\033[0m To finish the configuration wrap your script by modifying the file at \033[1m%s\033[0m\n", mainPath)
 		}
 

cmd/platform.go

@@ -5,9 +5,10 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/codeupify/upify/internal/config"
+	"github.com/codeupify/upify/internal/infra"
 	"github.com/codeupify/upify/internal/lang"
-	"github.com/codeupify/upify/internal/platform/aws/lambda"
-	"github.com/codeupify/upify/internal/platform/gcp/cloudrun"
+	"github.com/codeupify/upify/internal/platform/aws"
+	"github.com/codeupify/upify/internal/platform/gcp"
 	"github.com/spf13/cobra"
 )
 
@@ -29,10 +30,10 @@ var platformListCmd = &cobra.Command{
 	},
 }
 
-var awsLambdaCmd = &cobra.Command{
-	Use:   "aws-lambda",
-	Short: "Add AWS Lambda configuration",
-	RunE:  addAWSLambda,
+var awsCmd = &cobra.Command{
+	Use:   "aws",
+	Short: "Add AWS configuration",
+	RunE:  addAws,
 }
 
 var awsRegion string
@@ -42,28 +43,28 @@ var gcpRegion string
 var gcpProjectId string
 var gcpRuntime string
 
-var gcpCloudRunCmd = &cobra.Command{
-	Use:   "gcp-cloudrun",
-	Short: "Add GCP Cloud Run configuration",
-	RunE:  addGCPCloudRun,
+var gcpCmd = &cobra.Command{
+	Use:   "gcp",
+	Short: "Add GCP configuration",
+	RunE:  addGCP,
 }
 
 func init() {
 	rootCmd.AddCommand(platformCmd)
 	platformCmd.AddCommand(platformAddCmd)
 	platformCmd.AddCommand(platformListCmd)
 
-	platformAddCmd.AddCommand(awsLambdaCmd)
-	awsLambdaCmd.Flags().StringVar(&awsRegion, "region", "", "AWS region")
-	awsLambdaCmd.Flags().StringVar(&awsRuntime, "runtime", "", "Lambda runtime")
+	platformAddCmd.AddCommand(awsCmd)
+	awsCmd.Flags().StringVar(&awsRegion, "region", "", "AWS region")
+	awsCmd.Flags().StringVar(&awsRuntime, "runtime", "", "Lambda runtime")
 
-	platformAddCmd.AddCommand(gcpCloudRunCmd)
-	gcpCloudRunCmd.Flags().StringVar(&gcpRegion, "region", "", "GCP region")
-	gcpCloudRunCmd.Flags().StringVar(&gcpProjectId, "project-id", "", "GCP project ID")
-	gcpCloudRunCmd.Flags().StringVar(&gcpRuntime, "runtime", "", "Cloud Run runtime")
+	platformAddCmd.AddCommand(gcpCmd)
+	gcpCmd.Flags().StringVar(&gcpRegion, "region", "", "GCP region")
+	gcpCmd.Flags().StringVar(&gcpProjectId, "project-id", "", "GCP project ID")
+	gcpCmd.Flags().StringVar(&gcpRuntime, "runtime", "", "Cloud Run runtime")
 }
 
-func addAWSLambda(cmd *cobra.Command, args []string) error {
+func addAws(cmd *cobra.Command, args []string) error {
 	cfg, err := config.LoadConfig()
 	if err != nil {
 		return fmt.Errorf("failed to load config: %w", err)
@@ -80,7 +81,7 @@ func addAWSLambda(cmd *cobra.Command, args []string) error {
 	}
 
 	if awsRuntime == "" {
-		runtimes := getAWSRuntimes(cfg.Language)
+		runtimes := getAWSLambdaRuntimes(cfg.Language)
 		if len(runtimes) == 0 {
 			return fmt.Errorf("CLI doesn't support the specified language yet for AWS Lambda: %s", cfg.Language)
 		}
@@ -94,23 +95,15 @@ func addAWSLambda(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	if err := lambda.AddConfig(cfg, awsRegion, awsRuntime); err != nil {
+	if err := aws.AddPlatform(cfg, awsRegion, awsRuntime); err != nil {
 		return err
 	}
 
-	if err := lambda.AddHandler(cfg); err != nil {
-		return err
-	}
-
-	if err := config.SaveConfig(cfg); err != nil {
-		return fmt.Errorf("failed to save config: %w", err)
-	}
-
-	fmt.Println("Added AWS Lambda platform.")
+	fmt.Println("Added AWS platform.")
 	return nil
 }
 
-func addGCPCloudRun(cmd *cobra.Command, args []string) error {
+func addGCP(cmd *cobra.Command, args []string) error {
 	cfg, err := config.LoadConfig()
 	if err != nil {
 		return fmt.Errorf("failed to load config: %w", err)
@@ -136,9 +129,9 @@ func addGCPCloudRun(cmd *cobra.Command, args []string) error {
 	}
 
 	if gcpRuntime == "" {
-		runtimes := getGCPRuntimes(cfg.Language)
+		runtimes := getGCPCloudRunRuntimes(cfg.Language)
 		if len(runtimes) == 0 {
-			return fmt.Errorf("CLI doesn't support the specified language yet for GCP Cloud Run: %s", cfg.Language)
+			return fmt.Errorf("CLI doesn't support the specified language yet for GCP: %s", cfg.Language)
 		}
 
 		runtimeQ := &survey.Select{
@@ -150,36 +143,16 @@ func addGCPCloudRun(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	if err := cloudrun.AddConfig(cfg, gcpRegion, gcpProjectId, gcpRuntime); err != nil {
+	if err := gcp.AddPlatform(cfg, gcpRegion, gcpRuntime, gcpProjectId); err != nil {
 		return err
 	}
 
-	if err := cloudrun.AddHandler(cfg); err != nil {
-		return err
-	}
-
-	if err := config.SaveConfig(cfg); err != nil {
-		return fmt.Errorf("failed to save config: %w", err)
-	}
-
 	return nil
 }
 
 func listPlatforms() error {
-	cfg, err := config.LoadConfig()
-	if err != nil {
-		return fmt.Errorf("failed to load config: %w", err)
-	}
-
-	var platforms []string
-
-	if cfg.AWSLambda != nil {
-		platforms = append(platforms, "aws-lambda")
-	}
-	if cfg.GCPCloudRun != nil {
-		platforms = append(platforms, "gcp-cloudrun")
-	}
 
+	platforms := infra.ListPlatforms()
 	if len(platforms) == 0 {
 		fmt.Println("No platforms configured.")
 	} else {
@@ -192,7 +165,7 @@ func listPlatforms() error {
 	return nil
 }
 
-func getAWSRuntimes(language lang.Language) []string {
+func getAWSLambdaRuntimes(language lang.Language) []string {
 	switch language {
 	case lang.Python:
 		return []string{"python3.8", "python3.9", "python3.10", "python3.11", "python3.12"}
@@ -203,7 +176,7 @@ func getAWSRuntimes(language lang.Language) []string {
 	}
 }
 
-func getGCPRuntimes(language lang.Language) []string {
+func getGCPCloudRunRuntimes(language lang.Language) []string {
 	switch language {
 	case lang.Python:
 		return []string{"python37", "python38", "python39", "python310", "python311", "python312"}

docs/assets/demo.tape

@@ -62,7 +62,7 @@ Require echo
 Set Shell "bash"
 Set FontSize 20
 Set Width 1600
-Set Height 500
+Set Height 800
 
 Sleep 1s
 Type@.15s "upify init" Sleep 1s Enter

docs/commands.md

@@ -18,16 +18,16 @@ upify init
 Add platform support to your project.
 
 ```bash
-upify platform add aws-lambda
-upify platform add gcp-cloudrun
+upify platform add aws
+upify platform add gcp
 ```
 
 ## deploy
 Deploy your application to the specified platform.
 
 ```bash
-upify deploy aws-lambda
-upify deploy gcp-cloudrun
+upify deploy aws
+upify deploy gcp
 ```
 
 ## Flags

docs/configuration.md

@@ -19,23 +19,7 @@ entrypoint: main.py
 app_var: app
 ```
 
-## AWS Lambda Configuration
-```yaml
-aws-lambda:
-  region: us-east-1
-  role_name: lambda-role
-  runtime: python3.12 | nodejs20.x
-```
-
-## GCP Cloud Run Configuration
-```yaml
-gcp-cloudrun:
-  region: us-central1
-  project_id: your-project-id
-  runtime: python312 | nodejs20
-```
-
-## Reference
+### Reference
 
 | Field | Description |
 |-------|-------------|
@@ -44,4 +28,13 @@ gcp-cloudrun:
 | language | Programming language |
 | package_manager | Package management tool |
 | entrypoint | Main application file |
-| app_var | App variable name in entrypoint |
+| app_var | App variable name in entrypoint |
+
+# Terraform
+
+Upify leverages Terraform for infrastructure management, terraform files are written to:
+
+- `.upify/environments`
+- `.upify/modules`
+
+At this time Upify only supports a single `prod` environment, but in the future we will add support for additional environments

docs/getting-started.md

@@ -41,10 +41,10 @@ upify init
 
 4. Add cloud platform:
 ```bash
-upify platform add aws-lambda
+upify platform add aws
 ```
 
 5. Deploy:
 ```bash
-upify deploy aws-lambda
+upify deploy aws
 ```

docs/wrappers.md

@@ -18,10 +18,10 @@ from main import app
 
 handler = None
 
-if os.getenv("UPIFY_DEPLOY_PLATFORM") == "aws-lambda":
+if os.getenv("UPIFY_DEPLOY_PLATFORM") == "aws":
     from apig_wsgi import make_lambda_handler
     handler = make_lambda_handler(app)
-if os.getenv("UPIFY_DEPLOY_PLATFORM") == "gcp-cloudrun":
+if os.getenv("UPIFY_DEPLOY_PLATFORM") == "gcp":
     import functions_framework
 
     @functions_framework.http