Merge pull request #463 from hazelops/IZE-605-serverless-v-3-supported

IZE-605 IZE-606 serverless v3 supported
hazelops · Sep 21, 2022 · 154274f · 154274f
2 parents e41cbab + 54e3433
commit 154274f
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 11 deletions.
diff --git a/internal/config/app.go b/internal/config/app.go
@@ -20,6 +20,7 @@ type Serverless struct {
 	Name                    string   `mapstructure:",omitempty"`
 	File                    string   `mapstructure:",omitempty"`
 	NodeVersion             string   `mapstructure:"node_version"`
+	ServerlessVersion       string   `mapstructure:"serverless_version"`
 	Path                    string   `mapstructure:",omitempty"`
 	SLSNodeModuleCacheMount string   `mapstructure:",omitempty"`
 	CreateDomain            bool     `mapstructure:"create_domain"`

diff --git a/internal/manager/serverless/native.go b/internal/manager/serverless/native.go
@@ -54,9 +54,26 @@ func (sls *Manager) runDeploy(w io.Writer) error {
 	if len(nvmDir) == 0 {
 		nvmDir = "$HOME/.nvm"
 	}
+	var command string
 
-	command := fmt.Sprintf(
-		`source %s/nvm.sh && 
+	// SLS v3 has breaking changes in syntax
+	if sls.App.ServerlessVersion == "3" {
+		command = fmt.Sprintf(
+			`source %s/nvm.sh && 
+				nvm use %s &&
+				npx serverless deploy \
+				--config=%s \
+				--param="service=%s" \				
+				--region=%s \
+				--param="profile=%s" \
+				--stage=%s \
+				--verbose \`,
+			nvmDir, sls.App.NodeVersion, sls.App.File,
+			sls.App.Name, sls.App.AwsRegion,
+			sls.App.AwsProfile, sls.Project.Env)
+	} else {
+		command = fmt.Sprintf(
+			`source %s/nvm.sh && 
 				nvm use %s &&
 				npx serverless deploy \
 				--config %s \
@@ -65,9 +82,10 @@ func (sls *Manager) runDeploy(w io.Writer) error {
 				--region %s \
 				--profile %s \
 				--stage %s`,
-		nvmDir, sls.App.NodeVersion, sls.App.File,
-		sls.App.Name, sls.App.AwsRegion,
-		sls.App.AwsProfile, sls.Project.Env)
+			nvmDir, sls.App.NodeVersion, sls.App.File,
+			sls.App.Name, sls.App.AwsRegion,
+			sls.App.AwsProfile, sls.Project.Env)
+	}
 
 	cmd := exec.Command("bash", "-c", command)
 	cmd.Stdout = w
@@ -88,8 +106,26 @@ func (sls *Manager) runRemove(w io.Writer) error {
 		nvmDir = "$HOME/.nvm"
 	}
 
-	command := fmt.Sprintf(
-		`source %s/nvm.sh && 
+	var command string
+
+	// SLS v3 has breaking changes in syntax
+	if sls.App.ServerlessVersion == "3" {
+		command = fmt.Sprintf(
+			`source %s/nvm.sh && 
+				nvm use %s &&
+				npx serverless remove \
+				--config=%s \
+				--param="service=%s" \				
+				--region=%s \
+				--param="profile=%s" \
+				--stage=%s \
+				--verbose \`,
+			nvmDir, sls.App.NodeVersion, sls.App.File,
+			sls.App.Name, sls.App.AwsRegion,
+			sls.App.AwsProfile, sls.Project.Env)
+	} else {
+		command = fmt.Sprintf(
+			`source %s/nvm.sh && 
 				nvm use %s &&
 				npx serverless remove \
 				--config %s \
@@ -98,9 +134,10 @@ func (sls *Manager) runRemove(w io.Writer) error {
 				--region %s \
 				--profile %s \
 				--stage %s`,
-		nvmDir, sls.App.NodeVersion, sls.App.File,
-		sls.App.Name, sls.App.AwsRegion,
-		sls.App.AwsProfile, sls.Project.Env)
+			nvmDir, sls.App.NodeVersion, sls.App.File,
+			sls.App.Name, sls.App.AwsRegion,
+			sls.App.AwsProfile, sls.Project.Env)
+	}
 
 	cmd := exec.Command("bash", "-c", command)
 	cmd.Stdout = w

diff --git a/internal/manager/serverless/serverless.go b/internal/manager/serverless/serverless.go
@@ -32,8 +32,18 @@ func (sls *Manager) prepare() {
 	}
 
 	if len(sls.App.File) == 0 {
-		sls.App.File = "serverless.yml"
+		_, err := os.Stat(filepath.Join(sls.App.Path, "serverless.ts"))
+		if os.IsNotExist(err) {
+			sls.App.File = "serverless.yml"
+		} else {
+			sls.App.File = "serverless.ts"
+		}
+	}
+
+	if len(sls.App.ServerlessVersion) == 0 {
+		sls.App.ServerlessVersion = "2"
 	}
+
 	if len(sls.App.SLSNodeModuleCacheMount) == 0 {
 		sls.App.SLSNodeModuleCacheMount = fmt.Sprintf("%s-node-modules", sls.App.Name)
 	}

diff --git a/internal/schema/ize-spec.json b/internal/schema/ize-spec.json
@@ -251,6 +251,10 @@
                     "type": "string",
                     "description": "(optional) Node version that will be used by nvm can be specified here that. Default is v14."
                 },
+                "serverless_version": {
+                    "type": "string",
+                    "description": "(optional) Serverless framework version which is used. Defines cli interface. Default is 2."
+                },
                 "create_domain" : {
                     "type": "boolean",
                     "description": "(optional) Create domain for the serverless domain manager during the deployment."
@@ -375,6 +379,10 @@
                     "type": "string",
                     "description": "(optional) Node version that will be used by nvm can be specified here that. Default is v14."
                 },
+                "serverless_version": {
+                    "type": "string",
+                    "description": "(optional) Serverless framework version which is used. Defines cli interface. Default is 2."
+                },
                 "create_domain" : {
                     "type": "boolean",
                     "description": "(optional) Create domain for the serverless domain manager during the deployment."