From 96d50e66c0e25e07a88ee5f1f25611e4e5ca8229 Mon Sep 17 00:00:00 2001 From: dikhan Date: Fri, 14 Sep 2018 15:12:06 -0700 Subject: [PATCH] fix merging compile errors --- openapi/api_spec_analyser.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/openapi/api_spec_analyser.go b/openapi/api_spec_analyser.go index cb02cdd3c..59941fb67 100644 --- a/openapi/api_spec_analyser.go +++ b/openapi/api_spec_analyser.go @@ -55,15 +55,13 @@ func (asa apiSpecAnalyser) getResourcesInfo() (resourcesInfo, error) { continue } - isMultiRegion, regions := r.isMultiRegionResource(asa.d.Spec().Extensions) if isMultiRegion { - log.Printf("[INFO] resource '%s' is configured with host override AND multi region; creating reasource per region", r.name) + log.Printf("[INFO] resource '%s' is configured with host override AND multi region; creating reasource per region", r.path) for regionName, regionHost := range regions { resourceRegionName := fmt.Sprintf("%s_%s", resourceName, regionName) regionResource := resourceInfo{} regionResource = r - regionResource.name = resourceRegionName regionResource.host = regionHost log.Printf("[INFO] multi region resource: name = %s, region = %s, host = %s", regionName, resourceRegionName, regionHost) resources[resourceRegionName] = regionResource @@ -78,7 +76,7 @@ func (asa apiSpecAnalyser) getResourcesInfo() (resourcesInfo, error) { } // Fall back to override the host if value is not empty; otherwise global host will be used as usual if hostOverride != "" { - log.Printf("[INFO] resource '%s' is configured with host override, API calls will be made against '%s' instead of '%s'", r.name, hostOverride, asa.d.Spec().Host) + log.Printf("[INFO] resource '%s' is configured with host override, API calls will be made against '%s' instead of '%s'", r.path, hostOverride, asa.d.Spec().Host) r.host = hostOverride } resources[resourceName] = r