Merge pull request #959 from aziontech/dev

Deploy to Production - 2024/10/01

messages/build/messages.go

@@ -12,7 +12,6 @@ var (
 	BuildStatic           = "Skipping build step. Build isn't applied to the type 'static'\n"
 	BuildNotNecessary     = "Skipping build step. There were no changes detected in your project"
 	FlagTemplate          = "The Edge Application's preset; Inform this flag if you wish to change the project's preset during build"
-	FlagMode              = "The Edge Application's mode; Inform this flag if you wish to change the project's mode during build"
 	FlagWorker            = "Indicates that the constructed code inserts its own worker expression, such as addEventListener(\"fetch\") or similar, without the need to inject a provider"
 	FlagPolyfill          = "Use node polyfills in build"
 	FlagEntry             = "Code entrypoint; (default: ./main.js)"

messages/init/errors.go

@@ -6,7 +6,6 @@ var (
 	EdgeApplicationsOutputErr = errors.New("This output-ctrl option is not available. Read the readme files found in the repository https://github.com/aziontech/azion-template and try again")
 
 	ErrorVulcanExecute                 = errors.New("Error executing Vulcan: %s")
-	ErrorModeNotSent                   = errors.New("You must send the --mode flag when --template is not nextjs/simple/static")
 	ErrorUpdatingVulcan                = errors.New("Failed to update Vulcan: %s")
 	ErrorInstallVulcan                 = errors.New("Failed to install Vulcan: %s")
 	ErrorOpeningConfigFile             = errors.New("Failed to open the config.json file. The file doesn't exist, is corrupted, or has an invalid JSON format. Verify if the file format is JSON or fix its content according to the JSON format specification at https://www.json.org/json-en.html")
@@ -21,8 +20,7 @@ var (
 	ErrorFailedCreatingAzionDirectory  = errors.New("Failed to create the azion directory. The public's parent directory is read-only and/or isn't accessible. Change the permissions of the parent directory to read and write and/or give access to it")
 	ErrorDeps                          = errors.New("Failed to install project dependencies")
 	ErrorWorkingDir                    = errors.New("Failed to change current working directory")
-	ErrorModeNotFound                  = errors.New("No mode was found for the selected template. For more information, run the command again using the '--debug' flag. If the problem persists, contact Azion’s support")
 	ErrorReadingGitignore              = errors.New("Failed to read your .gitignore file")
 	ErrorWritingGitignore              = errors.New("Failed to write to your .gitignore file")
-	ErrorGetProjectInfo                = errors.New("Failed to get project info (preset and mode)")
+	ErrorGetProjectInfo                = errors.New("Failed to get project preset")
 )

messages/init/messages.go

@@ -18,7 +18,7 @@ var (
 	EdgeApplicationsInitFlagNo            = "Answers all yes/no interactions automatically with no"
 	WebAppInitContentOverridden           = "This application was already configured. Do you want to override the previous configuration? <yes | no> (default: no) "
 	WebAppInitCmdSuccess                  = "Template successfully fetched and configured\n"
-	InitGettingTemplates                  = "\nGetting modes available (Some dependencies may need to be installed)\n"
+	InitGettingTemplates                  = "\nGetting presets available (Some dependencies may need to be installed)\n"
 	InitGettingVulcan                     = "\nGetting templates available\n"
 	InitProjectQuestion                   = "Your application's name: "
 	EdgeApplicationsInitFlagHelp          = "Displays more information about the init command"

messages/link/errors.go

@@ -6,7 +6,6 @@ var (
 	EdgeApplicationsOutputErr = errors.New("This output-ctrl option is not available. Read the readme files found in the repository https://github.com/aziontech/azion-template and try again")
 
 	ErrorVulcanExecute                 = errors.New("Error executing Vulcan: %s")
-	ErrorModeNotSent                   = errors.New("You must send the --mode flag when --template is not nextjs/simple/static")
 	ErrorUpdatingVulcan                = errors.New("Failed to update Vulcan: %s")
 	ErrorInstallVulcan                 = errors.New("Failed to install Vulcan: %s")
 	ErrorOpeningConfigFile             = errors.New("Failed to open the config.json file. The file doesn't exist, is corrupted, or has an invalid JSON format. Verify if the file format is JSON or fix its content according to the JSON format specification at https://www.json.org/json-en.html")

messages/link/messages.go

@@ -12,7 +12,6 @@ var (
 	EdgeApplicationsLinkRunningCmd        = "Running link step command:\n\n"
 	EdgeApplicationsLinkFlagName          = "The Edge Application's name"
 	EdgeApplicationsLinkFlagTemplate      = "The Edge Application's template"
-	EdgeApplicationsLinkFlagMode          = "The Edge Application's mode"
 	WebAppLinkCmdSuccess                  = "Project successfully configured\n"
 	LinkGettingTemplates                  = "Getting templates available\n"
 	LinkProjectQuestion                   = "(Hit enter to accept the suggested name in parenthesis) Your application's name: "

pkg/api/edge_applications/edge_applications.go

@@ -495,7 +495,7 @@ func (c *Client) CreateDeviceGroups(ctx context.Context, req *CreateDeviceGroups
 	return &resp.Results, nil
 }
 
-func (c *Client) CreateRulesEngineNextApplication(ctx context.Context, applicationId int64, cacheId int64, typeLang string, mode string, authorize bool) error {
+func (c *Client) CreateRulesEngineNextApplication(ctx context.Context, applicationId int64, cacheId int64, typeLang string, authorize bool) error {
 	logger.Debug("Create Rules Engine Next Application")
 
 	req := CreateRulesEngineRequest{}

pkg/cmd/build/build.go

@@ -51,7 +51,6 @@ func NewCobraCmd(build *BuildCmd) *cobra.Command {
 
 	buildCmd.Flags().BoolP("help", "h", false, msg.BuildFlagHelp)
 	buildCmd.Flags().StringVar(&fields.Preset, "preset", "", msg.FlagTemplate)
-	buildCmd.Flags().StringVar(&fields.Mode, "mode", "", msg.FlagMode)
 	buildCmd.Flags().StringVar(&fields.Entry, "entry", "", msg.FlagEntry)
 	buildCmd.Flags().StringVar(&fields.NodePolyfills, "use-node-polyfills", "", msg.FlagPolyfill)
 	buildCmd.Flags().StringVar(&fields.OwnWorker, "use-own-worker", "", msg.FlagWorker)

pkg/cmd/build/run.go

@@ -29,11 +29,6 @@ func (b *BuildCmd) run(fields *contracts.BuildInfo, msgs *[]string) error {
 		conf.Preset = fields.Preset
 	}
 
-	if fields.Mode != "" {
-		vulcanParams += " --mode " + fields.Mode
-		conf.Mode = fields.Mode
-	}
-
 	if fields.Entry != "" {
 		vulcanParams += " --entry " + fields.Entry
 	}
@@ -43,15 +38,15 @@ func (b *BuildCmd) run(fields *contracts.BuildInfo, msgs *[]string) error {
 		if err != nil {
 			return fmt.Errorf("%w: %s", msg.ErrorPolyfills, fields.NodePolyfills)
 		}
-		vulcanParams += " --useNodePolyfills " + fields.NodePolyfills
+		vulcanParams += " --polyfills " + fields.NodePolyfills
 	}
 
 	if fields.OwnWorker != "" {
 		_, err := strconv.ParseBool(fields.OwnWorker)
 		if err != nil {
 			return fmt.Errorf("%w: %s", msg.ErrorWorker, fields.OwnWorker)
 		}
-		vulcanParams += " --useOwnWorker " + fields.OwnWorker
+		vulcanParams += " --worker " + fields.OwnWorker
 	}
 
 	if fields.IsFirewall {

pkg/cmd/build/run_test.go

@@ -117,7 +117,6 @@ func TestBuildCmd_run(t *testing.T) {
 				fields: &contracts.BuildInfo{
 					ProjectPath:   "",
 					Preset:        "vanilla",
-					Mode:          "compute",
 					Entry:         "no",
 					NodePolyfills: "true",
 					OwnWorker:     "true",
@@ -163,7 +162,6 @@ func TestBuildCmd_run(t *testing.T) {
 				fields: &contracts.BuildInfo{
 					ProjectPath:   "",
 					Preset:        "vanilla",
-					Mode:          "compute",
 					Entry:         "no",
 					NodePolyfills: "true",
 					OwnWorker:     "true",
@@ -210,7 +208,6 @@ func TestBuildCmd_run(t *testing.T) {
 				fields: &contracts.BuildInfo{
 					ProjectPath:   "",
 					Preset:        "vanilla",
-					Mode:          "compute",
 					Entry:         "no",
 					NodePolyfills: "adf",
 					OwnWorker:     "true",
@@ -257,7 +254,6 @@ func TestBuildCmd_run(t *testing.T) {
 				fields: &contracts.BuildInfo{
 					ProjectPath:   "",
 					Preset:        "vanilla",
-					Mode:          "compute",
 					Entry:         "no",
 					NodePolyfills: "true",
 					OwnWorker:     "adf",

pkg/cmd/deploy/requests.go

@@ -255,7 +255,7 @@ func (cmd *DeployCmd) doRulesDeploy(ctx context.Context, conf *contracts.AzionAp
 	}
 
 	// creates gzip and cache rules
-	err := client.CreateRulesEngineNextApplication(ctx, conf.Application.ID, cacheId, conf.Preset, conf.Mode, authorize)
+	err := client.CreateRulesEngineNextApplication(ctx, conf.Application.ID, cacheId, conf.Preset, authorize)
 	if err != nil {
 		logger.Debug("Error while creating rules engine", zap.Error(err))
 		return err

pkg/cmd/deploy_remote/requests.go

@@ -259,7 +259,7 @@ func (cmd *DeployCmd) doRulesDeploy(
 	}
 
 	// creates gzip and cache rules
-	err := client.CreateRulesEngineNextApplication(ctx, conf.Application.ID, cacheId, conf.Preset, conf.Mode, authorize)
+	err := client.CreateRulesEngineNextApplication(ctx, conf.Application.ID, cacheId, conf.Preset, authorize)
 	if err != nil {
 		logger.Debug("Error while creating rules engine", zap.Error(err))
 		return err