fix: check attr is nil prior going copy (#74)

Signed-off-by: Artur Troian <[email protected]>

go/manifest/v2beta2/group.go

@@ -60,7 +60,7 @@ func (g *Group) Validate(helper *validateManifestGroupsHelper) error {
 func (g *Group) checkAgainstGSpec(gspec *groupSpec) error {
 	for _, svc := range g.Services {
 		if err := svc.checkAgainstGSpec(gspec); err != nil {
-			return fmt.Errorf("%s: group %q: %w", ErrManifestCrossValidation, g.Name, err)
+			return fmt.Errorf("%w: group %q: %w", ErrManifestCrossValidation, g.Name, err)
 		}
 	}
 

go/manifest/v2beta2/groups.go

@@ -34,6 +34,8 @@ func (groups Groups) Validate() error {
 }
 
 func (groups Groups) CheckAgainstGSpecs(gspecs dtypes.GroupSpecs) error {
+	gspecs = gspecs.Dup()
+
 	if err := groups.Validate(); err != nil {
 		return err
 	}

go/manifest/v2beta2/service.go

@@ -66,6 +66,7 @@ func (s *Service) checkAgainstGSpec(gspec *groupSpec) error {
 	for idx := range gspec.gs.Resources {
 		if s.Resources.ID == gspec.gs.Resources[idx].ID {
 			gRes = &gspec.gs.Resources[idx]
+			break
 		}
 	}
 

go/node/deployment/v1beta3/groupspec.go

@@ -18,6 +18,26 @@ var _ ResourceGroup = (*GroupSpec)(nil)
 
 type GroupSpecs []*GroupSpec
 
+func (gspecs GroupSpecs) Dup() GroupSpecs {
+	res := make(GroupSpecs, 0, len(gspecs))
+
+	for _, gspec := range gspecs {
+		gs := gspec.Dup()
+		res = append(res, &gs)
+	}
+	return res
+}
+
+func (g GroupSpec) Dup() GroupSpec {
+	res := GroupSpec{
+		Name:         g.Name,
+		Requirements: g.Requirements.Dup(),
+		Resources:    g.Resources,
+	}
+
+	return res
+}
+
 // ValidateBasic asserts non-zero values
 func (g GroupSpec) ValidateBasic() error {
 	return g.validate()

go/node/deployment/v1beta3/resourceunit.go

@@ -13,6 +13,14 @@ func (r *ResourceUnit) FullPrice() sdk.DecCoin {
 	return sdk.NewDecCoinFromDec(r.Price.Denom, r.Price.Amount.MulInt64(int64(r.Count)))
 }
 
+func (r *ResourceUnit) Dup() ResourceUnit {
+	return ResourceUnit{
+		Resources: r.Resources.Dup(),
+		Count:     r.Count,
+		Price:     r.GetPrice(),
+	}
+}
+
 func (r *ResourceUnit) validate() error {
 	if r.Count > uint32(validationConfig.MaxUnitCount) || r.Count < uint32(validationConfig.MinUnitCount) {
 		return fmt.Errorf("error: invalid unit count (%v > %v > %v fails)",

go/node/deployment/v1beta3/resourceunits.go

@@ -23,6 +23,16 @@ func (s ResourceUnits) Less(i, j int) bool {
 	return s[i].ID < s[j].ID
 }
 
+func (s ResourceUnits) Dup() ResourceUnits {
+	res := make(ResourceUnits, 0, len(s))
+
+	for _, ru := range s {
+		res = append(res, ru.Dup())
+	}
+
+	return s
+}
+
 func (s ResourceUnits) Validate() error {
 	if count := len(s); count > validationConfig.MaxGroupUnits {
 		return fmt.Errorf("too many units (%v > %v)", count, validationConfig.MaxGroupUnits)

go/node/types/v1beta3/attribute.go

@@ -76,6 +76,13 @@ func (val attributeValue) AsString() (string, bool) {
 	return val.value, true
 }
 
+func (m PlacementRequirements) Dup() PlacementRequirements {
+	return PlacementRequirements{
+		SignedBy:   m.SignedBy,
+		Attributes: m.Attributes.Dup(),
+	}
+}
+
 func NewStringAttribute(key, val string) Attribute {
 	return Attribute{
 		Key:   key,
@@ -141,6 +148,10 @@ func (attr Attributes) ValidateWithRegex(r *regexp.Regexp) error {
 }
 
 func (attr Attributes) Dup() Attributes {
+	if attr == nil {
+		return nil
+	}
+
 	res := make(Attributes, 0, len(attr))
 
 	for _, pair := range attr {