Skip to content

Commit 24100a3

Browse files
authored
merge tags with only different cases (#5304)
1 parent af28d0e commit 24100a3

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

tools/importer-rest-api-specs/internal/components/apidefinitions/parse_api_resource.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package apidefinitions
55

66
import (
77
"fmt"
8+
"strings"
89

910
sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
1011
"github.com/hashicorp/pandora/tools/importer-rest-api-specs/internal/components/apidefinitions/parser"
@@ -71,6 +72,12 @@ func parseAPIResourcesFromFile(filePath, serviceName string, resourceProvider *s
7172
}
7273

7374
if resource != nil {
75+
for existsName := range parsedAPIResources {
76+
if strings.EqualFold(inferredTag, existsName) && inferredTag != existsName {
77+
logging.Warnf("conflict inferred Tag: %s to existing Tag: %s, reuse existing Tag", inferredTag, existsName)
78+
inferredTag = existsName
79+
}
80+
}
7481
discoveredResources := map[string]sdkModels.APIResource{
7582
inferredTag: *resource,
7683
}

0 commit comments

Comments
 (0)