feat(instance): add OrganizationDefault to UpdateSecurityGroup (#279)

scaleway · Dec 23, 2019 · 6777369 · 6777369
1 parent 321b71b
commit 6777369
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/api/instance/v1/security_group_utils.go b/api/instance/v1/security_group_utils.go
@@ -17,6 +17,7 @@ type UpdateSecurityGroupRequest struct {
 	InboundDefaultPolicy  *SecurityGroupPolicy `json:"inbound_default_policy,omitempty"`
 	OutboundDefaultPolicy *SecurityGroupPolicy `json:"outbound_default_policy,omitempty"`
 	Stateful              *bool                `json:"stateful,omitempty"`
+	OrganizationDefault   *bool                `json:"organization_default,omitempty"`
 }
 
 type UpdateSecurityGroupResponse struct {
@@ -80,6 +81,9 @@ func (s *API) UpdateSecurityGroup(req *UpdateSecurityGroupRequest, opts ...scw.R
 	if req.Stateful != nil {
 		setRequest.Stateful = *req.Stateful
 	}
+	if req.OrganizationDefault != nil {
+		setRequest.OrganizationDefault = *req.OrganizationDefault
+	}
 
 	setRes, err := s.setSecurityGroup(setRequest, opts...)
 	if err != nil {

diff --git a/api/instance/v1/security_group_utils_test.go b/api/instance/v1/security_group_utils_test.go
@@ -38,16 +38,17 @@ func TestAPI_UpdateSecurityGroup(t *testing.T) {
 
 	accept := SecurityGroupPolicyAccept
 	drop := SecurityGroupPolicyDrop
-	f := false
 
 	updateResponse, err := instanceAPI.UpdateSecurityGroup(&UpdateSecurityGroupRequest{
 		Zone:                  zone,
 		SecurityGroupID:       createResponse.SecurityGroup.ID,
 		Name:                  scw.StringPtr("new_name"),
 		Description:           scw.StringPtr("new_description"),
-		Stateful:              &f,
+		Stateful:              scw.BoolPtr(false),
 		InboundDefaultPolicy:  &drop,
 		OutboundDefaultPolicy: &accept,
+		// Keep false here, switch it to true is too dangerous for the one who update the test cassette.
+		OrganizationDefault: scw.BoolPtr(false),
 	})
 
 	testhelpers.AssertNoError(t, err)
@@ -56,6 +57,7 @@ func TestAPI_UpdateSecurityGroup(t *testing.T) {
 	testhelpers.Equals(t, SecurityGroupPolicyDrop, updateResponse.SecurityGroup.InboundDefaultPolicy)
 	testhelpers.Equals(t, SecurityGroupPolicyAccept, updateResponse.SecurityGroup.OutboundDefaultPolicy)
 	testhelpers.Equals(t, false, updateResponse.SecurityGroup.Stateful)
+	testhelpers.Equals(t, false, updateResponse.SecurityGroup.OrganizationDefault)
 
 	err = instanceAPI.DeleteSecurityGroup(&DeleteSecurityGroupRequest{
 		Zone:            zone,