refactoring to wrap methods with a common sendRequest method

kong/plugin_service.go

@@ -23,7 +23,7 @@ type AbstractPluginService interface {
 	// Delete deletes a Plugin in Kong
 	Delete(ctx context.Context, usernameOrID *string) error
 	// DeleteForService deletes a Plugin in Kong
-	DeleteForService(ctx context.Context, serviceIDorName *string, plugin *Plugin) error
+	DeleteForService(ctx context.Context, serviceIDorName *string, pluginID *string) error
 	// List fetches a list of Plugins in Kong.
 	List(ctx context.Context, opt *ListOpt) ([]*Plugin, *ListOpt, error)
 	// ListAll fetches all Plugins in Kong.
@@ -103,20 +103,10 @@ func (s *PluginService) Create(ctx context.Context,
 		queryPath = queryPath + "/" + *plugin.ID
 		method = "PUT"
 	}
-	req, err := s.client.NewRequest(method, queryPath, nil, plugin)
-	if err != nil {
-		return nil, err
-	}
-
-	var createdPlugin Plugin
-	_, err = s.client.Do(ctx, req, &createdPlugin)
-	if err != nil {
-		return nil, err
-	}
-	return &createdPlugin, nil
+	return s.sendRequest(ctx, plugin, queryPath, method)
 }
 
-// Create creates a Plugin in Kong.
+// CreateForService creates a Plugin in Kong at Service level.
 // If an ID is specified, it will be used to
 // create a plugin in Kong, otherwise an ID
 // is auto-generated.
@@ -130,18 +120,7 @@ func (s *PluginService) CreateForService(ctx context.Context,
 		return nil, fmt.Errorf("serviceIDorName cannot be nil")
 	}
 
-	endpoint := fmt.Sprintf("/services/%v/plugins", *serviceIDorName)
-	req, err := s.client.NewRequest("POST", endpoint, nil, plugin)
-	if err != nil {
-		return nil, err
-	}
-
-	var createdPlugin Plugin
-	_, err = s.client.Do(ctx, req, &createdPlugin)
-	if err != nil {
-		return nil, err
-	}
-	return &createdPlugin, nil
+	return s.sendRequest(ctx, plugin, fmt.Sprintf("/services/%v/plugins", *serviceIDorName), "POST")
 }
 
 // Get fetches a Plugin in Kong.
@@ -175,20 +154,10 @@ func (s *PluginService) Update(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/plugins/%v", *plugin.ID)
-	req, err := s.client.NewRequest("PATCH", endpoint, nil, plugin)
-	if err != nil {
-		return nil, err
-	}
-
-	var updatedAPI Plugin
-	_, err = s.client.Do(ctx, req, &updatedAPI)
-	if err != nil {
-		return nil, err
-	}
-	return &updatedAPI, nil
+	return s.sendRequest(ctx, plugin, endpoint, "PATCH")
 }
 
-// Update updates a Plugin in Kong
+// UpdateForService updates a Plugin in Kong at Service level.
 func (s *PluginService) UpdateForService(ctx context.Context,
 	serviceIDorName *string, plugin *Plugin,
 ) (*Plugin, error) {
@@ -200,55 +169,35 @@ func (s *PluginService) UpdateForService(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/services/%v/plugins/%v", *serviceIDorName, *plugin.ID)
-	req, err := s.client.NewRequest("PATCH", endpoint, nil, plugin)
-	if err != nil {
-		return nil, err
-	}
-
-	var updatedAPI Plugin
-	_, err = s.client.Do(ctx, req, &updatedAPI)
-	if err != nil {
-		return nil, err
-	}
-	return &updatedAPI, nil
+	return s.sendRequest(ctx, plugin, endpoint, "PATCH")
 }
 
 // Delete deletes a Plugin in Kong
 func (s *PluginService) Delete(ctx context.Context,
-	usernameOrID *string,
+	pluginID *string,
 ) error {
-	if isEmptyString(usernameOrID) {
-		return fmt.Errorf("usernameOrID cannot be nil for Delete operation")
-	}
-
-	endpoint := fmt.Sprintf("/plugins/%v", *usernameOrID)
-	req, err := s.client.NewRequest("DELETE", endpoint, nil, nil)
-	if err != nil {
-		return err
+	if isEmptyString(pluginID) {
+		return fmt.Errorf("pluginID cannot be nil for Delete operation")
 	}
 
-	_, err = s.client.Do(ctx, req, nil)
+	endpoint := fmt.Sprintf("/plugins/%v", *pluginID)
+	_, err := s.sendRequest(ctx, nil, endpoint, "DELETE")
 	return err
 }
 
-// DeleteForService deletes a Plugin in Kong
+// DeleteForService deletes a Plugin in Kong at Service level.
 func (s *PluginService) DeleteForService(ctx context.Context,
-	serviceIDorName *string, plugin *Plugin,
+	serviceIDorName *string, pluginID *string,
 ) error {
-	if isEmptyString(plugin.ID) {
+	if isEmptyString(pluginID) {
 		return fmt.Errorf("plugin ID cannot be nil for Delete operation")
 	}
 	if isEmptyString(serviceIDorName) {
 		return fmt.Errorf("serviceIDorName cannot be nil")
 	}
 
-	endpoint := fmt.Sprintf("/services/%v/plugins/%v", *serviceIDorName, *plugin.ID)
-	req, err := s.client.NewRequest("DELETE", endpoint, nil, nil)
-	if err != nil {
-		return err
-	}
-
-	_, err = s.client.Do(ctx, req, nil)
+	endpoint := fmt.Sprintf("/services/%v/plugins/%v", *serviceIDorName, *pluginID)
+	_, err := s.sendRequest(ctx, nil, endpoint, "DELETE")
 	return err
 }
 
@@ -374,3 +323,32 @@ func (s *PluginService) ListAllForRoute(ctx context.Context,
 	}
 	return s.listAllByPath(ctx, "/routes/"+*routeID+"/plugins")
 }
+
+func (s *PluginService) sendRequest(ctx context.Context, plugin *Plugin, endpoint, method string) (*Plugin, error) {
+	var req *http.Request
+	var err error
+	if method == "DELETE" {
+		req, err = s.client.NewRequest(method, endpoint, nil, nil)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		req, err = s.client.NewRequest(method, endpoint, nil, plugin)
+		if err != nil {
+			return nil, err
+		}
+	}
+	var createdPlugin Plugin
+	if method == "DELETE" {
+		_, err = s.client.Do(ctx, req, nil)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		_, err = s.client.Do(ctx, req, &createdPlugin)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return &createdPlugin, nil
+}

kong/plugin_service_test.go

@@ -117,7 +117,7 @@ func TestPluginsService(T *testing.T) {
 	assert.Equal(id, *createdPlugin.ID)
 	assert.Equal("false", updatedPlugin.Config["anonymous"])
 
-	err = client.Plugins.DeleteForService(defaultCtx, createdService.Name, updatedPlugin)
+	err = client.Plugins.DeleteForService(defaultCtx, createdService.Name, updatedPlugin.ID)
 	assert.NoError(err)
 }