refactor(ufw):

- fixed update rules

Author: alexTiugan

internal/cmd/ufw/rules/update/update.go

@@ -25,12 +25,7 @@ import (
 const (
 	instanceIdArg = "INSTANCE_ID"
 
-	sourceIpFlag    = "sourceIp"
-	directionFlag   = "direction"
-	descriptionFlag = "description"
-	etherTypeFlag   = "etherType"
-	portRangeFlag   = "portRange"
-	protocolFlag    = "protocol"
+	sourceIpFlag = "sourceIp"
 )
 
 type inputModel struct {
@@ -107,11 +102,6 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 
 func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP(sourceIpFlag, "s", "", "The IP (CIDR) to which the rule applies (e.g. 192.168.0.1/32)")
-	cmd.Flags().StringP(directionFlag, "d", "", "Direction (the direction of the traffic, typically ingress or egress, for security rules type)")
-	cmd.Flags().StringP(descriptionFlag, "D", "", "Description")
-	cmd.Flags().StringP(etherTypeFlag, "e", "", "Specifies the bound of the rule (for security rules type)")
-	cmd.Flags().StringP(portRangeFlag, "r", "", "Port range (the Port range to which the rule applies, for security rules type)")
-	cmd.Flags().String(protocolFlag, "", "The network protocol (e.g. TCP, UDP, ICMP, for security rules type)")
 
 	err := flags.MarkFlagsRequired(cmd, sourceIpFlag)
 	cobra.CheckErr(err)
@@ -133,12 +123,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 		GlobalFlagModel: globalFlags,
 		InstanceId:      instanceId,
 
-		SourceIp:    flags.FlagToStringPointer(p, cmd, sourceIpFlag),
-		Direction:   flags.FlagToStringPointer(p, cmd, directionFlag),
-		Description: flags.FlagToStringPointer(p, cmd, descriptionFlag),
-		EtherType:   flags.FlagToStringPointer(p, cmd, etherTypeFlag),
-		PortRange:   flags.FlagToStringPointer(p, cmd, portRangeFlag),
-		Protocol:    flags.FlagToStringPointer(p, cmd, protocolFlag),
+		SourceIp: flags.FlagToStringPointer(p, cmd, sourceIpFlag),
 	}
 
 	p.DebugInputModel(model)
@@ -148,14 +133,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 func buildRequest(ctx context.Context, model *inputModel, apiClient *ufw.APIClient) ufw.ApiUpdateRuleRequest {
 	req := apiClient.DefaultAPI.UpdateRule(ctx, model.ProjectId, model.Region, model.InstanceId)
 
-	// TODO - add logic for field checking: existing ACLs, correct product, type, instanceID maybe
-
 	req = req.UpdateRulePayload(ufw.UpdateRulePayload{
-		SourceIP:  *model.SourceIp,
-		Direction: model.Direction,
-		EtherType: model.EtherType,
-		PortRange: model.PortRange,
-		Protocol:  model.Protocol,
+		SourceIP: *model.SourceIp,
 	})
 
 	return req

internal/cmd/ufw/rules/update/update_test.go

@@ -43,11 +43,6 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
 		globalflags.ProjectIdFlag: testProjectId,
 		globalflags.RegionFlag:    testRegion,
 		sourceIpFlag:              testSourceIp,
-		directionFlag:             "ingress",
-		descriptionFlag:           "example-description",
-		etherTypeFlag:             "IPv4",
-		portRangeFlag:             "80-443",
-		protocolFlag:              "TCP",
 	}
 	for _, mod := range mods {
 		mod(flagValues)
@@ -62,13 +57,8 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 			Region:    testRegion,
 			Verbosity: globalflags.VerbosityDefault,
 		},
-		RuleRefId:   "", // Left blank because parseInput in the source file currently does not populate it
-		SourceIp:    new(testSourceIp),
-		Direction:   new("ingress"),
-		Description: new("example-description"),
-		EtherType:   new("IPv4"),
-		PortRange:   new("80-443"),
-		Protocol:    new("TCP"),
+		InstanceId: testRuleRefId,
+		SourceIp:   new(testSourceIp),
 	}
 	for _, mod := range mods {
 		mod(model)
@@ -79,11 +69,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 func fixtureRequest(mods ...func(request *ufw.ApiUpdateRuleRequest)) ufw.ApiUpdateRuleRequest {
 	request := testClient.DefaultAPI.UpdateRule(testCtx, testProjectId, testRegion, testRuleRefId)
 	request = request.UpdateRulePayload(ufw.UpdateRulePayload{
-		SourceIP:  testSourceIp,
-		Direction: new("ingress"),
-		EtherType: new("IPv4"),
-		PortRange: new("80-443"),
-		Protocol:  new("TCP"),
+		SourceIP: testSourceIp,
 	})
 	for _, mod := range mods {
 		mod(&request)
@@ -133,7 +119,8 @@ func TestParseInput(t *testing.T) {
 					Region:    testRegion,
 					Verbosity: globalflags.VerbosityDefault,
 				},
-				SourceIp: new(testSourceIp),
+				InstanceId: testRuleRefId,
+				SourceIp:   new(testSourceIp),
 			},
 		},
 		{
@@ -192,10 +179,8 @@ func TestBuildRequest(t *testing.T) {
 		expectedRequest ufw.ApiUpdateRuleRequest
 	}{
 		{
-			description: "base",
-			model: fixtureInputModel(func(model *inputModel) {
-				model.RuleRefId = testRuleRefId // Inject the ID that parseInput currently skips
-			}),
+			description:     "base",
+			model:           fixtureInputModel(),
 			expectedRequest: fixtureRequest(),
 		},
 		{
@@ -206,8 +191,8 @@ func TestBuildRequest(t *testing.T) {
 					Region:    testRegion,
 					Verbosity: globalflags.VerbosityDefault,
 				},
-				RuleRefId: testRuleRefId,
-				SourceIp:  new(testSourceIp),
+				InstanceId: testRuleRefId,
+				SourceIp:   new(testSourceIp),
 			},
 			expectedRequest: testClient.DefaultAPI.UpdateRule(testCtx, testProjectId, testRegion, testRuleRefId).
 				UpdateRulePayload(ufw.UpdateRulePayload{