Merge pull request #123 from ans-group/loadbalancer-arguments-valuetype

Loadbalancer arguments value type
ans-group · Sep 20, 2022 · 2f828b1 · 2f828b1
2 parents 6f719ba + 274f472
commit 2f828b1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 26 deletions.
diff --git a/pkg/service/loadbalancer/model.go b/pkg/service/loadbalancer/model.go
@@ -233,8 +233,8 @@ type ACL struct {
 
 // ACLArgument represents an ACL condition/action argument
 type ACLArgument struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
+	Name  string      `json:"name"`
+	Value interface{} `json:"value"`
 }
 
 // ACLCondition represents an ACL condition
@@ -257,29 +257,22 @@ type ACLTemplates struct {
 }
 
 type ACLTemplateCondition struct {
-	Name         string                         `json:"name"`
-	FriendlyName string                         `json:"friendly_name"`
-	Description  string                         `json:"description"`
-	Arguments    []ACLTemplateConditionArgument `json:"arguments"`
-}
-
-type ACLTemplateConditionArgument struct {
-	Name        string   `json:"name"`
-	Description string   `json:"description"`
-	Example     string   `json:"example"`
-	Values      []string `json:"values"`
+	Name         string                `json:"name"`
+	FriendlyName string                `json:"friendly_name"`
+	Description  string                `json:"description"`
+	Arguments    []ACLTemplateArgument `json:"arguments"`
 }
 
 type ACLTemplateAction struct {
-	Name         string                      `json:"name"`
-	FriendlyName string                      `json:"friendly_name"`
-	Description  string                      `json:"description"`
-	Arguments    []ACLTemplateActionArgument `json:"arguments"`
+	Name         string                `json:"name"`
+	FriendlyName string                `json:"friendly_name"`
+	Description  string                `json:"description"`
+	Arguments    []ACLTemplateArgument `json:"arguments"`
 }
 
-type ACLTemplateActionArgument struct {
-	Name        string   `json:"name"`
-	Description string   `json:"description"`
-	Example     string   `json:"example"`
-	Values      []string `json:"values"`
+type ACLTemplateArgument struct {
+	Name        string      `json:"name"`
+	Description string      `json:"description"`
+	Example     interface{} `json:"example"`
+	Values      []string    `json:"values"`
 }
diff --git a/pkg/service/loadbalancer/service_listener_acl_test.go b/pkg/service/loadbalancer/service_listener_acl_test.go
@@ -24,7 +24,7 @@ func TestGetListenerACLs(t *testing.T) {
 			connection: c,
 		}
 
-		c.EXPECT().Get("/loadbalancers/v2/acls?listener_id=123", gomock.Any()).Return(&connection.APIResponse{
+		c.EXPECT().Get("/loadbalancers/v2/listeners/123/acls", gomock.Any()).Return(&connection.APIResponse{
 			Response: &http.Response{
 				Body:       ioutil.NopCloser(bytes.NewReader([]byte("{\"data\":[{\"id\":456}],\"meta\":{\"pagination\":{\"total_pages\":1}}}"))),
 				StatusCode: 200,
@@ -64,7 +64,7 @@ func TestGetListenerACLs(t *testing.T) {
 			connection: c,
 		}
 
-		c.EXPECT().Get("/loadbalancers/v2/acls?listener_id=123", gomock.Any()).Return(&connection.APIResponse{}, errors.New("test error 1"))
+		c.EXPECT().Get("/loadbalancers/v2/listeners/123/acls", gomock.Any()).Return(&connection.APIResponse{}, errors.New("test error 1"))
 
 		_, err := s.GetListenerACLs(123, connection.APIRequestParameters{})
 

diff --git a/pkg/service/loadbalancer/service_targetgroup_acl_test.go b/pkg/service/loadbalancer/service_targetgroup_acl_test.go
@@ -24,7 +24,7 @@ func TestGetTargetGroupACLs(t *testing.T) {
 			connection: c,
 		}
 
-		c.EXPECT().Get("/loadbalancers/v2/acls?target_group_id=123", gomock.Any()).Return(&connection.APIResponse{
+		c.EXPECT().Get("/loadbalancers/v2/target-groups/123/acls", gomock.Any()).Return(&connection.APIResponse{
 			Response: &http.Response{
 				Body:       ioutil.NopCloser(bytes.NewReader([]byte("{\"data\":[{\"id\":456}],\"meta\":{\"pagination\":{\"total_pages\":1}}}"))),
 				StatusCode: 200,
@@ -64,7 +64,7 @@ func TestGetTargetGroupACLs(t *testing.T) {
 			connection: c,
 		}
 
-		c.EXPECT().Get("/loadbalancers/v2/acls?target_group_id=123", gomock.Any()).Return(&connection.APIResponse{}, errors.New("test error 1"))
+		c.EXPECT().Get("/loadbalancers/v2/target-groups/123/acls", gomock.Any()).Return(&connection.APIResponse{}, errors.New("test error 1"))
 
 		_, err := s.GetTargetGroupACLs(123, connection.APIRequestParameters{})