Merge pull request #327 from redhatrises/packaging_fixes

Update use of set.v0 to latest code

Author: shawndwells

pkg/lib/components/versions/3_1_0/component.go

@@ -8,8 +8,8 @@ import (
 	"sort"
 
 	"github.com/blang/semver"
+	"github.com/fatih/set"
 	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
-	"gopkg.in/fatih/set.v0"
 )
 
 // Component struct is an individual component requiring documentation
@@ -132,7 +132,7 @@ func (s Satisfies) GetControlOrigin() string {
 
 // GetControlOrigins returns all the control origins
 func (s Satisfies) GetControlOrigins() []string {
-	controlOrigins := set.New()
+	controlOrigins := set.New(set.ThreadSafe)
 	for i := range s.ControlOrigins {
 		controlOrigins.Add(s.ControlOrigins[i])
 	}
@@ -151,7 +151,7 @@ func (s Satisfies) GetImplementationStatus() string {
 
 // GetImplementationStatuses returns all implementation statuses
 func (s Satisfies) GetImplementationStatuses() []string {
-	implementationStatuses := set.New()
+	implementationStatuses := set.New(set.ThreadSafe)
 	for i := range s.ImplementationStatuses {
 		implementationStatuses.Add(s.ImplementationStatuses[i])
 	}

tools/mapset/map.go

@@ -6,7 +6,7 @@ package mapset
 
 import (
 	"errors"
-	"gopkg.in/fatih/set.v0"
+	"github.com/fatih/set"
 )
 
 // MapSet is the map with each value being a set.
@@ -39,7 +39,7 @@ func (m *MapSet) Reserve(key string, value string) (result Result) {
 	}
 	var innerSet *set.Set
 	if _, ok := m.mapOfSet[key]; !ok {
-		innerSet = set.New()
+		innerSet = set.New(set.ThreadSafe).(*set.Set)
 		m.mapOfSet[key] = innerSet
 	}
 	if m.mapOfSet[key].Has(value) {

vendor.conf

@@ -1,4 +1,4 @@
-gopkg.in/fatih/set.v0 master
+github.com/fatih/set master
 github.com/stretchr/testify master
 github.com/stretchr/objx master
 github.com/davecgh/go-spew master