use ai suggestions

Author: dgghinea

pkg/apic/servicebuilder.go

@@ -300,7 +300,7 @@ func (b *serviceBodyBuilder) Build() (ServiceBody, error) {
 		return b.serviceBody, b.err
 	}
 
-	specParser := NewSpecResourceParser(b.serviceBody.SpecDefinition, b.serviceBody.ResourceType)
+	specParser := newParser(b.serviceBody.SpecDefinition, b.serviceBody.ResourceType)
 	err := specParser.Parse()
 	if err != nil {
 		return b.serviceBody, fmt.Errorf("failed to parse service specification for '%s': %s", b.serviceBody.APIName, err)

pkg/apic/servicebuilder_test.go

@@ -263,7 +263,7 @@ func TestServiceBodyBuilderWithLargeSpec(t *testing.T) {
 	assert.NotNil(t, sb)
 	assert.NotEqual(t, sb.originalSpecHash, sb.specHash)
 
-	t.Cleanup(func() { NewSpecResourceParser = newSpecResourceParser() })
+	t.Cleanup(resetSpecParserFactoryForTest)
 
 	// The original hash is computed before stripping, so it must differ from the final spec hash.
 	NewSpecResourceParserFactory(WithTagsToStrip([]string{"pet", "store", "user"}))
@@ -309,3 +309,10 @@ func TestServiceBodyBuilderWithLargeSpec(t *testing.T) {
 	assert.NotNil(t, sb)
 	assert.Equal(t, sb.originalSpecHash, sb.specHash)
 }
+
+func resetSpecParserFactoryForTest() {
+	specParserFactoryMu.Lock()
+	defer specParserFactoryMu.Unlock()
+
+	NewSpecResourceParser = newSpecResourceParser()
+}

pkg/apic/specparser.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"strings"
+	"sync"
 
 	management "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/management/v1alpha1"
 	"github.com/Axway/agent-sdk/pkg/util"
@@ -74,7 +75,10 @@ type SpecResourceParser struct {
 type newSpecParserFunc func(resourceSpec []byte, resourceSpecType string) SpecResourceParser
 type specParserOpt func(*SpecResourceParser)
 
-var NewSpecResourceParser newSpecParserFunc = newSpecResourceParser()
+var (
+	specParserFactoryMu   sync.RWMutex
+	NewSpecResourceParser newSpecParserFunc = newSpecResourceParser()
+)
 
 func WithTagsToStrip(tags []string) specParserOpt {
 	return func(sp *SpecResourceParser) {
@@ -83,9 +87,20 @@ func WithTagsToStrip(tags []string) specParserOpt {
 }
 
 func NewSpecResourceParserFactory(opts ...specParserOpt) {
+	specParserFactoryMu.Lock()
+	defer specParserFactoryMu.Unlock()
+
 	NewSpecResourceParser = newSpecResourceParser(opts...)
 }
 
+func newParser(resourceSpec []byte, resourceSpecType string) SpecResourceParser {
+	specParserFactoryMu.RLock()
+	parserConstructor := NewSpecResourceParser
+	specParserFactoryMu.RUnlock()
+
+	return parserConstructor(resourceSpec, resourceSpecType)
+}
+
 func newSpecResourceParser(opts ...specParserOpt) newSpecParserFunc {
 	return func(resourceSpec []byte, resourceSpecType string) SpecResourceParser {
 		hash, _ := util.ComputeHash(resourceSpec)