update infrastructure template for test

Signed-off-by: hanenMizouni <[email protected]>
outscale · Dec 12, 2024 · 3cd2461 · 3cd2461
1 parent eac07ee
commit 3cd2461
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/capm.yaml b/capm.yaml
@@ -349,6 +349,9 @@ spec:
                   securityGroups:
                     items:
                       properties:
+                        deleteDefaultOutboundRule:
+                          description: Should the default allow all outbound rule be deleted
+                          type: boolean
                         description:
                           description: The description of the security group
                           type: string
@@ -384,6 +387,9 @@ spec:
                               resourceId:
                                 description: The security group rule id
                                 type: string
+                              targetSecurityGroupName:
+                                description: The name of the security group to use as target
+                                type: string
                               toPortRange:
                                 description: The end of the port range
                                 format: int32

diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/outscale-dev/cluster-api-provider-outscale.git
 go 1.23.0
 
 require (
-	github.com/Jeffail/gabs v1.4.0
 	github.com/benbjohnson/clock v1.3.0
 	github.com/go-logr/logr v1.4.2
 	github.com/golang/mock v1.6.0

diff --git a/go.sum b/go.sum
@@ -3,8 +3,6 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo=
-github.com/Jeffail/gabs v1.4.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
 github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=

diff --git a/test/e2e/data/infrastructure-outscale/infrastructure-components.yaml b/test/e2e/data/infrastructure-outscale/infrastructure-components.yaml
@@ -207,6 +207,9 @@ spec:
                     securityGroups:
                       items:
                         properties:
+                          deleteDefaultOutboundRule:
+                            description: Should the default allow all outbound rule be deleted
+                            type: boolean
                           description:
                             description: The description of the security group
                             type: string
@@ -239,6 +242,9 @@ spec:
                                 resourceId:
                                   description: The security group rule id
                                   type: string
+                                targetSecurityGroupName:
+                                  description: The name of the security group to use as target
+                                  type: string
                                 toPortRange:
                                   description: The end of the port range
                                   format: int32

diff --git a/testenv/osccluster_controller_test.go b/testenv/osccluster_controller_test.go
@@ -1017,8 +1017,8 @@ var _ = Describe("Outscale Cluster Reconciler", func() {
 					},
 					SecurityGroups: []*infrastructurev1beta1.OscSecurityGroup{
 						{
-							Name:        "cluster-api-securitygroups-kw",
-							Description: "Security Group with cluster-api",
+							Name:                      "cluster-api-securitygroups-kw",
+							Description:               "Security Group with cluster-api",
 							DeleteDefaultOutboundRule: false,
 							SecurityGroupRules: []infrastructurev1beta1.OscSecurityGroupRule{
 								{
@@ -1056,8 +1056,8 @@ var _ = Describe("Outscale Cluster Reconciler", func() {
 							},
 						},
 						{
-							Name:        "cluster-api-securitygroups-kcp",
-							Description: "Security Group with cluster-api",
+							Name:                      "cluster-api-securitygroups-kcp",
+							Description:               "Security Group with cluster-api",
 							DeleteDefaultOutboundRule: false,
 							SecurityGroupRules: []infrastructurev1beta1.OscSecurityGroupRule{
 								{
@@ -1095,8 +1095,8 @@ var _ = Describe("Outscale Cluster Reconciler", func() {
 							},
 						},
 						{
-							Name:        "cluster-api-securitygroup-lb",
-							Description: "Security Group with cluster-api",
+							Name:                      "cluster-api-securitygroup-lb",
+							Description:               "Security Group with cluster-api",
 							DeleteDefaultOutboundRule: false,
 							SecurityGroupRules: []infrastructurev1beta1.OscSecurityGroupRule{
 								{