Add immutable rules to projects

Signed-off-by: Carlos Vega <carlos.vega@dynatrace.com>

Author: cvegagimenez

apiv2/pkg/clients/immutable/immutable.go

@@ -64,6 +64,8 @@ func (c *RESTClient) UpdateImmuRule(ctx context.Context, projectNameOrID string,
 
 	params.WithTimeout(c.Options.Timeout)
 
+	params.ImmutableRule.ID = immutableRuleID
+
 	_, err := c.V2Client.Immutable.UpdateImmuRule(params, c.AuthInfo)
 	if err != nil {
 		return handleSwaggerImmutableRuleErrors(err)
@@ -126,4 +128,4 @@ func (c *RESTClient) ListImmuRules(ctx context.Context, projectNameOrID string)
 	}
 
 	return immutableRules, nil
-}
+}

apiv2/pkg/clients/immutable/immutable_integration_test.go

@@ -5,7 +5,6 @@ package immutable
 import (
 	"context"
 	"testing"
-
 	"github.com/mittwald/goharbor-client/v5/apiv2/model"
 	"github.com/mittwald/goharbor-client/v5/apiv2/pkg/clients/project"
 	clienttesting "github.com/mittwald/goharbor-client/v5/apiv2/pkg/testing"
@@ -46,4 +45,72 @@ func TestAPIImmutableListImmutableRules(t *testing.T) {
 	listedImmutableRuleTag := listedImmutableRules[0].TagSelectors
 
 	require.Equal(t, listedImmutableRuleTag[0], immutableRule.TagSelectors[0])
+
+	immuRuleID := listedImmutableRules[0].ID
+
+	c.DeleteImmuRule(ctx, projectName, immuRuleID)
+
+	checkDeletedImmuRules, err := c.ListImmuRules(ctx, projectName)
+
+	require.Empty(t, checkDeletedImmuRules)
 }
+
+func TestAPIImmutableUpdateImmutableRules(t *testing.T) {
+	ctx := context.Background()
+
+	c := NewClient(clienttesting.V2SwaggerClient, clienttesting.DefaultOpts, clienttesting.AuthInfo)
+	pc := project.NewClient(clienttesting.V2SwaggerClient, clienttesting.DefaultOpts, clienttesting.AuthInfo)
+
+	err := pc.NewProject(ctx, &model.ProjectReq{
+		ProjectName: projectName,
+	})
+	require.NoError(t, err)
+
+	defer pc.DeleteProject(ctx, projectName)
+
+	createImmutableRule := model.ImmutableRule{
+		ScopeSelectors: map[string][]model.ImmutableSelector{},
+		TagSelectors: []*model.ImmutableSelector{{
+			Decoration: "matches",
+			Kind:       "doublestar",
+			Pattern:    "1.0.0",
+		}},
+	}
+
+	updateImmutableRule := model.ImmutableRule{
+		ScopeSelectors: map[string][]model.ImmutableSelector{},
+		TagSelectors: []*model.ImmutableSelector{{
+			Decoration: "matches",
+			Kind:       "doublestar",
+			Pattern:    "2.0.0",
+		}},
+	}
+
+	err = c.CreateImmuRule(ctx, projectName, &createImmutableRule)
+	require.NoError(t, err)
+
+	listedImmutableRules, err := c.ListImmuRules(ctx, projectName)
+
+	require.NoError(t, err)
+
+	immuRuleID := listedImmutableRules[0].ID
+
+	err = c.UpdateImmuRule(ctx, projectName, &updateImmutableRule, immuRuleID)
+
+	require.NoError(t, err)
+
+	listedImmutableRules, err = c.ListImmuRules(ctx, projectName)
+
+	require.NoError(t, err)
+
+	listedImmutableRuleTag := listedImmutableRules[0].TagSelectors
+
+	require.Equal(t, listedImmutableRuleTag[0], updateImmutableRule.TagSelectors[0])
+
+
+	c.DeleteImmuRule(ctx, projectName, immuRuleID)
+
+	checkDeletedImmuRules, err := c.ListImmuRules(ctx, projectName)
+
+	require.Empty(t, checkDeletedImmuRules)
+}

apiv2/pkg/clients/immutable/immutable_test.go

@@ -111,6 +111,7 @@ func TestRESTClient_UpdateImmuRule(t *testing.T) {
 		ImmutableRuleID: int64(immutableRuleID),
 		ProjectNameOrID: strconv.Itoa(projectID),
 		ImmutableRule: &model.ImmutableRule{
+			ID: int64(immutableRuleID),
 			TagSelectors: []*model.ImmutableSelector{{
 				Decoration: "matches",
 				Kind:       "doublestar",
@@ -174,6 +175,41 @@ func TestRESTClient_UpdateImmuRuleNotFound(t *testing.T) {
 	mockClient.Immutable.AssertExpectations(t)
 }
 
+func TestRESTClient_UpdateImmuRuleBadRequest(t *testing.T) {
+	apiClient, mockClient := APIandMockClientsForTests()
+
+	params := &immutable.UpdateImmuRuleParams{
+		ImmutableRuleID: int64(immutableRuleID),
+		ProjectNameOrID: strconv.Itoa(projectID),
+		ImmutableRule: &model.ImmutableRule{
+			TagSelectors: []*model.ImmutableSelector{{
+				Decoration: "matches",
+				Kind:       "doublestar",
+				Pattern:    "1.0.0",
+			}},
+			ScopeSelectors: map[string][]model.ImmutableSelector{
+				"repository": {{
+					Decoration: "repoMatches",
+					Kind:       "doublestar",
+					Pattern:    "**",
+				}},
+			},
+		},
+		Context: ctx,
+	}
+
+	params.WithTimeout(apiClient.Options.Timeout)
+
+	mockClient.Immutable.On("UpdateImmuRule", params, mock.AnythingOfType("runtime.ClientAuthInfoWriterFunc")).
+		Return(nil, &errors.ErrBadRequest{})
+
+	err := apiClient.UpdateImmuRule(ctx, strconv.Itoa(projectID), params.ImmutableRule, int64(immutableRuleID))
+
+	require.Error(t, err)
+
+	mockClient.Immutable.AssertExpectations(t)
+}
+
 func TestRESTClient_UpdateImmuRuleUnauthorized(t *testing.T) {
 	apiClient, mockClient := APIandMockClientsForTests()