when strip servers is set calculate the hash with and without servers, when both change publish without servers

Author: jcollins-axway

pkg/apic/servicebody.go

@@ -14,59 +14,62 @@ type APIKeyInfo struct {
 
 // ServiceBody - details about a service to create
 type ServiceBody struct {
-	NameToPush                string
-	APIName                   string
-	RestAPIID                 string
-	PrimaryKey                string
-	URL                       string
-	Stage                     string
-	StageDescriptor           string
-	StageDisplayName          string
-	Description               string
-	Version                   string
-	AuthPolicy                string
-	authPolicies              []string
-	apiKeyInfo                []APIKeyInfo
-	scopes                    map[string]string
-	SpecDefinition            []byte
-	Documentation             []byte
-	Tags                      map[string]interface{}
-	Image                     string
-	ImageContentType          string
-	CreatedBy                 string
-	ResourceContentType       string
-	ResourceType              string
-	SubscriptionName          string
-	APIUpdateSeverity         string
-	State                     string
-	Status                    string
-	ServiceAttributes         map[string]string
-	RevisionAttributes        map[string]string
-	InstanceAttributes        map[string]string
-	ServiceAgentDetails       map[string]interface{}
-	InstanceAgentDetails      map[string]interface{}
-	RevisionAgentDetails      map[string]interface{}
-	serviceContext            serviceContext
-	Endpoints                 []EndpointDefinition
-	UnstructuredProps         *UnstructuredProperties
-	TeamName                  string
-	teamID                    string
-	credentialRequestPolicies []string
-	ardName                   string
-	uniqueARD                 bool
-	ignoreSpecBasesCreds      bool
-	stripOASExtensions        bool
-	specHash                  string
-	specVersion               string
-	accessRequestDefinition   *management.AccessRequestDefinition
-	specHashes                map[string]interface{} // map of hash values to revision names
-	requestDefinitionsAllowed bool                   // used to validate if the instance can have request definitions or not. Use case example - v7 unpublished, remove request definitions
-	dataplaneType             DataplaneType
-	isDesignDataplane         bool
-	referencedServiceName     string
-	referencedInstanceName    string
-	logger                    log.FieldLogger
-	instanceLifecycle         *management.ApiServiceInstanceLifecycle
+	NameToPush                   string
+	APIName                      string
+	RestAPIID                    string
+	PrimaryKey                   string
+	URL                          string
+	Stage                        string
+	StageDescriptor              string
+	StageDisplayName             string
+	Description                  string
+	Version                      string
+	AuthPolicy                   string
+	authPolicies                 []string
+	apiKeyInfo                   []APIKeyInfo
+	scopes                       map[string]string
+	SpecDefinition               []byte
+	Documentation                []byte
+	Tags                         map[string]interface{}
+	Image                        string
+	ImageContentType             string
+	CreatedBy                    string
+	ResourceContentType          string
+	ResourceType                 string
+	SubscriptionName             string
+	APIUpdateSeverity            string
+	State                        string
+	Status                       string
+	ServiceAttributes            map[string]string
+	RevisionAttributes           map[string]string
+	InstanceAttributes           map[string]string
+	ServiceAgentDetails          map[string]interface{}
+	InstanceAgentDetails         map[string]interface{}
+	RevisionAgentDetails         map[string]interface{}
+	serviceContext               serviceContext
+	Endpoints                    []EndpointDefinition
+	UnstructuredProps            *UnstructuredProperties
+	TeamName                     string
+	teamID                       string
+	credentialRequestPolicies    []string
+	ardName                      string
+	uniqueARD                    bool
+	ignoreSpecBasesCreds         bool
+	stripOASExtensions           bool
+	stripOASServersBeforePublish bool
+	specHash                     string
+	specVersion                  string
+	accessRequestDefinition      *management.AccessRequestDefinition
+	specHashes                   map[string]interface{} // map of hash values to revision names
+	requestDefinitionsAllowed    bool                   // used to validate if the instance can have request definitions or not. Use case example - v7 unpublished, remove request definitions
+	dataplaneType                DataplaneType
+	isDesignDataplane            bool
+	referencedServiceName        string
+	referencedInstanceName       string
+	logger                       log.FieldLogger
+	instanceLifecycle            *management.ApiServiceInstanceLifecycle
+	originalSpecDefinition       []byte
+	originalSpecHash             string
 }
 
 // SetAccessRequestDefinitionName - set the name of the access request definition for this service body

pkg/apic/servicebuilder.go

@@ -56,6 +56,7 @@ type ServiceBuilder interface {
 	SetAccessRequestDefinitionName(accessRequestDefName string, isUnique bool) ServiceBuilder
 	SetIgnoreSpecBasedCreds(ignore bool) ServiceBuilder
 	SetStripOASExtensions(strip bool) ServiceBuilder
+	SetStripOASServersBeforePublish() ServiceBuilder
 
 	SetUnstructuredType(assetType string) ServiceBuilder
 	SetUnstructuredContentType(contentType string) ServiceBuilder
@@ -379,6 +380,15 @@ func (b *serviceBodyBuilder) Build() (ServiceBody, error) {
 		val.StripExtensions()
 	}
 
+	if b.serviceBody.stripOASServersBeforePublish {
+		b.serviceBody.originalSpecDefinition = b.serviceBody.SpecDefinition
+		b.serviceBody.originalSpecHash = b.serviceBody.specHash
+		val.stripEndpoints()
+		b.serviceBody.SpecDefinition = val.GetSpecBytes()
+		newHash, _ := util.ComputeHash(val.GetSpecBytes())
+		b.serviceBody.specHash = fmt.Sprintf("%v", newHash)
+	}
+
 	// only set ard name based on spec if not already set, use first auth we find
 	if b.serviceBody.ardName != "" {
 		return b.serviceBody, nil
@@ -426,6 +436,11 @@ func (b *serviceBodyBuilder) SetIgnoreSpecBasedCreds(ignore bool) ServiceBuilder
 	return b
 }
 
+func (b *serviceBodyBuilder) SetStripOASServersBeforePublish() ServiceBuilder {
+	b.serviceBody.stripOASServersBeforePublish = true
+	return b
+}
+
 func (b *serviceBodyBuilder) SetStripOASExtensions(strip bool) ServiceBuilder {
 	b.serviceBody.stripOASExtensions = strip
 	return b

pkg/apic/specoas2processor.go

@@ -78,6 +78,13 @@ func (p *oas2SpecProcessor) GetEndpoints() ([]EndpointDefinition, error) {
 	return endPoints, nil
 }
 
+func (p *oas2SpecProcessor) stripEndpoints() {
+	// strip the endpoints from the spec, these will be added based on the API Service EndpointDefinitions
+	p.spec.BasePath = ""
+	p.spec.Host = ""
+	p.spec.Schemes = []string{}
+}
+
 func (p *oas2SpecProcessor) ParseAuthInfo() {
 	authPolicies := []string{}
 	keyInfo := []APIKeyInfo{}

pkg/apic/specoas3processor.go

@@ -280,6 +280,11 @@ func (p *oas3SpecProcessor) StripExtensions() {
 	}
 }
 
+func (p *oas3SpecProcessor) stripEndpoints() {
+	// strip the endpoints from the spec, these will be added based on the API Service EndpointDefinitions
+	p.spec.Servers = []*openapi3.Server{}
+}
+
 func (p *oas3SpecProcessor) GetSpecBytes() []byte {
 	s, _ := json.Marshal(p.spec)
 	return s

pkg/apic/specparser.go

@@ -57,6 +57,7 @@ type OasSpecProcessor interface {
 	GetSpecBytes() []byte
 	GetResourceType() string
 	GetVersion() string
+	stripEndpoints()
 }
 
 // SpecResourceParser -