add basePath validation and assign servers URL's context as basePath [In Progress] #1954
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VirajSalaka
force-pushed
the
basepath-val
branch
from
1e15e5a to
eac426b
Compare
VirajSalaka
force-pushed
the
basepath-val
branch
from
eac426b to
76a396b
Compare
VirajSalaka
commented
Apr 23, 2021
| if override && apiKey == GenerateIdentifierForAPI(apiContent.VHost, mgwSwagger.GetTitle(), mgwSwagger.GetVersion()) { | ||
| continue | ||
| } | ||
| if swaggerEntry.GetXWso2Basepath() == mgwSwagger.GetXWso2Basepath() && apiContent.VHost == vhost { |
There was a problem hiding this comment.
use an additional map
VirajSalaka
commented
Apr 23, 2021
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
There was a problem hiding this comment.
Add License header
VirajSalaka
commented
Apr 23, 2021
VirajSalaka
commented
Apr 23, 2021
| @@ -294,6 +334,7 @@ func UpdateAPI(apiContent config.APIContent) { | |||
| if svcdiscovery.IsServiceDiscoveryEnabled { | |||
| startConsulServiceDiscovery() //consul service discovery starting point | |||
| } | |||
| return | |||
There was a problem hiding this comment.
useless return, remove
VirajSalaka
commented
Apr 23, 2021
| @@ -461,7 +462,8 @@ func createRoute(params *routeCreateParams) *routev3.Route { | |||
| Value: b.Bytes(), | |||
| } | |||
|
|
|||
| if xWso2Basepath != "" { | |||
| // if xWso2Basepath is not different compared to endpointBasepath, no need to substitute. | |||
| if xWso2Basepath != "" && xWso2Basepath != endpointBasepath { | |||
There was a problem hiding this comment.
remove the condition check to follow one path all the time.
VirajSalaka
commented
Apr 23, 2021
| err := swagger.validateBasePath() | ||
| if err != nil { | ||
| logger.LoggerOasparser.Errorf("Error while parsing the API %s:%s - %v", swagger.title, swagger.version, err) | ||
| } |
VirajSalaka
commented
Apr 23, 2021
| func (swagger *MgwSwagger) validateBasePath() error { | ||
| if xWso2BasePath == "" { | ||
| return errors.New("Empty Basepath is provided. use x-wso2-basePath extension, basePath (if OpenAPI v2 definition is used)" + | ||
| " servers entry (if OpenAPI v3 definition is used) with non empty context") |
There was a problem hiding this comment.
change the error message
VirajSalaka
commented
Apr 23, 2021
| @@ -106,7 +106,8 @@ public void handleSuccessRequest(RequestContext requestContext) { | |||
| FilterUtils.getTenantDomainFromRequestURL( | |||
| requestContext.getMatchedAPI().getAPIConfig().getBasePath()) == null | |||
| ? APIConstants.SUPER_TENANT_DOMAIN_NAME | |||
| : requestContext.getMatchedAPI().getAPIConfig().getBasePath()); | |||
| : FilterUtils.getTenantDomainFromRequestURL( | |||
There was a problem hiding this comment.
store the function's return value and reuse it
|
closed as the fixes are provided with #1970 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
$subject
Issues
Fixes #1958
Fixes #1952
Fixes #1959
Automation tests
Tested environments
Not Tested
Maintainers: Check before merge