fix gql fail

wso2 · Mar 29, 2024 · 5bb7d51 · 5bb7d51
1 parent 34b9b4e
commit 5bb7d51
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 9 deletions.
diff --git a/adapter/internal/discovery/xds/semantic_versioning.go b/adapter/internal/discovery/xds/semantic_versioning.go
@@ -147,7 +147,6 @@ func updateOldRegex(org string, oldSemVersions []oldSemVersion) {
  }
  }
  }
- logger.LoggerAPI.Error(oldSelectedSemVersion)
  if oldSelectedSemVersion == nil {
  continue
  }
@@ -157,27 +156,22 @@ func updateOldRegex(org string, oldSemVersions []oldSemVersion) {
  updateMinor := oldSelectedSemVersion.OldMinorSemVersion != nil && api.adapterInternalAPI.GetVersion() ==
  oldSelectedSemVersion.OldMinorSemVersion.Version
 
- // apiSemVersion, _ := semantic_version.ValidateAndGetVersionComponents(api.adapterInternalAPI.GetVersion())
  for _, route := range api.routes {
  regex := route.GetMatch().GetSafeRegex().GetRegex()
  regexRewritePattern := route.GetRoute().GetRegexRewrite().GetPattern().GetRegex()
  if updateMajor {
- logger.LoggerAPI.Error(166, regex)
  regex = strings.Replace(regex, GetMajorMinorVersionRangeRegex(oldSelectedSemVersion.OldMajorSemVersion),
  GetMinorVersionRangeRegex(oldSelectedSemVersion.OldMajorSemVersion), 1)
  regexRewritePattern = strings.Replace(regexRewritePattern,
  GetMajorMinorVersionRangeRegex(oldSelectedSemVersion.OldMajorSemVersion),
  GetMinorVersionRangeRegex(oldSelectedSemVersion.OldMajorSemVersion), 1)
- logger.LoggerAPI.Error(166, regex)
  }
  if updateMinor {
- logger.LoggerAPI.Error(175, regex)
  regex = strings.Replace(regex, GetMinorVersionRangeRegex(oldSelectedSemVersion.OldMinorSemVersion),
  GetVersionMatchRegex(oldSelectedSemVersion.OldMinorSemVersion.Version), 1)
  regexRewritePattern = strings.Replace(regexRewritePattern,
  GetMinorVersionRangeRegex(oldSelectedSemVersion.OldMinorSemVersion),
  GetVersionMatchRegex(oldSelectedSemVersion.OldMinorSemVersion.Version), 1)
- logger.LoggerAPI.Error(180, regex)
  }
  pathSpecifier := &routev3.RouteMatch_SafeRegex{
  SafeRegex: &matcherv3.RegexMatcher{

diff --git a/adapter/internal/discovery/xds/semantic_versioning_test.go b/adapter/internal/discovery/xds/semantic_versioning_test.go
@@ -327,7 +327,6 @@ func TestUpdateRoutingRulesOnAPIUpdate(t *testing.T) {
  finalRegex: apiID1ResourcePath,
  finalRewrite: apiID1ResourcePath,
  },
- // Expected final regex: ^/test-api/v1\.0/orders([/]{0,1}), Got: ^/test-api/v1(?:\.0)?/orders([/]{0,1})
  {
  name: "Create an API with major and minor version",
  organizationID: "org1",

diff --git a/adapter/internal/operator/synchronizer/gql_api.go b/adapter/internal/operator/synchronizer/gql_api.go
@@ -108,7 +108,7 @@ func generateGQLAdapterInternalAPI(apiState APIState, gqlRoute *GQLRouteState, e
 
 // getVhostForAPI returns the vHosts related to an API.
 func getVhostsForGQLAPI(gqlRoute *v1alpha2.GQLRoute) map[string]struct{} {
- var vHosts map[string]struct{}
+ vHosts := make(map[string]struct{})
  for _, hostName := range gqlRoute.Spec.Hostnames {
  vHosts[string(hostName)] = struct{}{}
  }

diff --git a/adapter/internal/operator/synchronizer/rest_api.go b/adapter/internal/operator/synchronizer/rest_api.go
@@ -131,7 +131,6 @@ func generateAdapterInternalAPI(apiState APIState, httpRoute *HTTPRouteState, en
 // getVhostForAPI returns the vHosts related to an API.
 func getVhostsForAPI(httpRoute *gwapiv1b1.HTTPRoute) map[string]struct{} {
  vHosts := make(map[string]struct{})
- loggers.LoggerAPI.Error("httpRoute.Spec.Hostnames: ", httpRoute.Spec.Hostnames)
  for _, hostName := range httpRoute.Spec.Hostnames {
  vHosts[string(hostName)] = struct{}{}
  }