Merge pull request #522 from scaleway/stateful-groups

Add security group stateful flags

Author: izissise

pkg/api/api.go

@@ -458,6 +458,9 @@ type ScalewaySecurityGroups struct {
 	Servers               []ScalewaySecurityGroup `json:"servers"`
 	EnableDefaultSecurity bool                    `json:"enable_default_security"`
 	OrganizationDefault   bool                    `json:"organization_default"`
+	Stateful              bool                    `json:"stateful"`
+	InboundDefaultPolicy  string                  `json:"inbound_default_policy"`
+	OutboundDefaultPolicy string                  `json:"outbound_default_policy"`
 }
 
 // ScalewayGetSecurityGroups represents the response of a GET /security_groups/
@@ -503,17 +506,23 @@ type ScalewaySecurityGroup struct {
 
 // ScalewayNewSecurityGroup definition POST request /security_groups
 type ScalewayNewSecurityGroup struct {
-	Organization string `json:"organization"`
-	Name         string `json:"name"`
-	Description  string `json:"description"`
+	Organization          string `json:"organization"`
+	Name                  string `json:"name"`
+	Description           string `json:"description"`
+	Stateful              bool   `json:"stateful"`
+	InboundDefaultPolicy  string `json:"inbound_default_policy"`
+	OutboundDefaultPolicy string `json:"outbound_default_policy"`
 }
 
 // ScalewayUpdateSecurityGroup definition PUT request /security_groups
 type ScalewayUpdateSecurityGroup struct {
-	Organization        string `json:"organization"`
-	Name                string `json:"name"`
-	Description         string `json:"description"`
-	OrganizationDefault bool   `json:"organization_default"`
+	Organization          string `json:"organization"`
+	Name                  string `json:"name"`
+	Description           string `json:"description"`
+	OrganizationDefault   bool   `json:"organization_default"`
+	Stateful              bool   `json:"stateful"`
+	InboundDefaultPolicy  string `json:"inbound_default_policy"`
+	OutboundDefaultPolicy string `json:"outbound_default_policy"`
 }
 
 // ScalewayServer represents a Scaleway server

pkg/cli/x_security-groups.go

@@ -25,8 +25,8 @@ var cmdSecurityGroups = &Command{
 
 	$ scw _security-groups list-groups
 	$ scw _security-groups show-group SGID
-	$ scw _security-groups new-group --name=NAME --desc=DESC
-	$ scw _security-groups update-group SGID --name=NAME --desc=DESC
+	$ scw _security-groups new-group --name=NAME --description=DESC --stateful=[true, false] --inbound=[accept, drop] --outbound=[accept, drop]
+	$ scw _security-groups update-group SGID --name=NAME --desc=DESC --stateful=[true, false] --inbound=[accept, drop] --outbound=[accept, drop]
 	$ scw _security-groups delete-group SGID
 
 	$ scw _security-groups list-rules SGID
@@ -42,6 +42,9 @@ func init() {
 	cmdSecurityGroups.Flag.BoolVar(&securityGroupsHelp, []string{"h", "-help"}, false, "Print usage")
 	cmdSecurityGroups.Flag.StringVar(&securityGroupsName, []string{"n", "-name"}, "", "SecurityGroup's name")
 	cmdSecurityGroups.Flag.StringVar(&securityGroupsDesc, []string{"d", "-description"}, "", "SecurityGroup's description")
+	cmdSecurityGroups.Flag.BoolVar(&securityGroupsStateful, []string{"s", "-stateful"}, false, "is SecurityGroup stateful")
+	cmdSecurityGroups.Flag.StringVar(&securityGroupsInboundDefaultPolicy, []string{"i", "-inbound"}, "accept", "Inbound default policy")
+	cmdSecurityGroups.Flag.StringVar(&securityGroupsOutboundDefaultPolicy, []string{"o", "-outbound"}, "accept", "Outbound default policy")
 	subCmdSecurityGroup = map[string]func(cmd *Command, args []string) error{
 		"list-groups":  listSecurityGroup,
 		"new-group":    newSecurityGroup,
@@ -57,9 +60,12 @@ func init() {
 }
 
 // Flags
-var securityGroupsHelp bool   // -h, --help flag
-var securityGroupsName string // -n, --name flag
-var securityGroupsDesc string // -d, --description flag
+var securityGroupsHelp bool                    // -h, --help flag
+var securityGroupsName string                  // -n, --name flag
+var securityGroupsDesc string                  // -d, --description flag
+var securityGroupsStateful bool                // -s, --stateful flag
+var securityGroupsInboundDefaultPolicy string  // -i, --inbound flag
+var securityGroupsOutboundDefaultPolicy string // -o, --outbound flag
 
 // SubCommand
 var subCmdSecurityGroup map[string]func(cmd *Command, args []string) error
@@ -81,16 +87,31 @@ func printRawMode(out io.Writer, data interface{}) error {
 	return nil
 }
 
+func isValidPolicy(policy string) bool {
+	switch policy {
+	case
+		"accept",
+		"drop":
+		return true
+	}
+	return false
+}
+
 func newSecurityGroup(cmd *Command, args []string) error {
 	fmt.Println(securityGroupsDesc)
 	fmt.Println(securityGroupsName)
-	if securityGroupsName == "" || securityGroupsDesc == "" {
+	if securityGroupsName == "" || securityGroupsDesc == "" ||
+		!isValidPolicy(securityGroupsInboundDefaultPolicy) ||
+		!isValidPolicy(securityGroupsOutboundDefaultPolicy) {
 		return cmd.PrintShortUsage()
 	}
 	return cmd.API.PostSecurityGroup(api.ScalewayNewSecurityGroup{
-		Organization: cmd.API.Organization,
-		Name:         securityGroupsName,
-		Description:  securityGroupsDesc,
+		Organization:          cmd.API.Organization,
+		Name:                  securityGroupsName,
+		Description:           securityGroupsDesc,
+		Stateful:              securityGroupsStateful,
+		InboundDefaultPolicy:  securityGroupsInboundDefaultPolicy,
+		OutboundDefaultPolicy: securityGroupsOutboundDefaultPolicy,
 	})
 }
 
@@ -100,9 +121,12 @@ func updateSecurityGroup(cmd *Command, args []string) error {
 		return cmd.PrintShortUsage()
 	}
 	return cmd.API.PutSecurityGroup(api.ScalewayUpdateSecurityGroup{
-		Organization: cmd.API.Organization,
-		Name:         securityGroupsName,
-		Description:  securityGroupsDesc,
+		Organization:          cmd.API.Organization,
+		Name:                  securityGroupsName,
+		Description:           securityGroupsDesc,
+		Stateful:              securityGroupsStateful,
+		InboundDefaultPolicy:  securityGroupsInboundDefaultPolicy,
+		OutboundDefaultPolicy: securityGroupsOutboundDefaultPolicy,
 	}, args[0])
 }
 

pkg/cli/x_security-groups_test.go

@@ -0,0 +1,14 @@
+package cli
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestSecurity_groups(t *testing.T) {
+	Convey("Testing Security groups valid policy", t, func() {
+		So(isValidPolicy("accept"), ShouldEqual, true)
+		So(isValidPolicy("notvalid"), ShouldEqual, false)
+	})
+}