Skip to content

Commit 0d64cd6

Browse files
committed
Fix spelling mistakes
(cherry picked from commit b25d1f0)
1 parent 32aba50 commit 0d64cd6

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

pkg/lib/k8s/virtual_service.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ type VirtualServiceSpec struct {
5959
}
6060

6161
func VirtualService(spec *VirtualServiceSpec) *kunstructured.Unstructured {
62-
virtualServceConfig := &kunstructured.Unstructured{}
63-
virtualServceConfig.SetGroupVersionKind(virtualServiceGVK)
64-
virtualServceConfig.SetName(spec.Name)
65-
virtualServceConfig.SetNamespace(spec.Namespace)
66-
virtualServceConfig.Object["metadata"] = map[string]interface{}{
62+
virtualServiceConfig := &kunstructured.Unstructured{}
63+
virtualServiceConfig.SetGroupVersionKind(virtualServiceGVK)
64+
virtualServiceConfig.SetName(spec.Name)
65+
virtualServiceConfig.SetNamespace(spec.Namespace)
66+
virtualServiceConfig.Object["metadata"] = map[string]interface{}{
6767
"name": spec.Name,
6868
"namespace": spec.Namespace,
6969
"labels": spec.Labels,
@@ -74,7 +74,7 @@ func VirtualService(spec *VirtualServiceSpec) *kunstructured.Unstructured {
7474
"match": []map[string]interface{}{
7575
{
7676
"uri": map[string]interface{}{
77-
"prefix": urls.CannonicalizeEndpoint(spec.Path),
77+
"prefix": urls.CanonicalizeEndpoint(spec.Path),
7878
},
7979
},
8080
},
@@ -90,19 +90,19 @@ func VirtualService(spec *VirtualServiceSpec) *kunstructured.Unstructured {
9090
},
9191
}
9292

93-
if spec.Rewrite != nil && urls.CannonicalizeEndpoint(*spec.Rewrite) != urls.CannonicalizeEndpoint(spec.Path) {
93+
if spec.Rewrite != nil && urls.CanonicalizeEndpoint(*spec.Rewrite) != urls.CanonicalizeEndpoint(spec.Path) {
9494
httpSpec["rewrite"] = map[string]interface{}{
95-
"uri": urls.CannonicalizeEndpoint(*spec.Rewrite),
95+
"uri": urls.CanonicalizeEndpoint(*spec.Rewrite),
9696
}
9797
}
9898

99-
virtualServceConfig.Object["spec"] = map[string]interface{}{
99+
virtualServiceConfig.Object["spec"] = map[string]interface{}{
100100
"hosts": []string{"*"},
101101
"gateways": spec.Gateways,
102102
"http": []map[string]interface{}{httpSpec},
103103
}
104104

105-
return virtualServceConfig
105+
return virtualServiceConfig
106106
}
107107

108108
func (c *Client) CreateVirtualService(spec *kunstructured.Unstructured) (*kunstructured.Unstructured, error) {
@@ -288,7 +288,7 @@ func GetVirtualServiceEndpoints(virtualService *kunstructured.Unstructured) (str
288288
return nil, errors.New("prefix is not a string") // unexpected
289289
}
290290

291-
endpoints.Add(urls.CannonicalizeEndpoint(prefix))
291+
endpoints.Add(urls.CanonicalizeEndpoint(prefix))
292292
}
293293
}
294294

pkg/lib/urls/urls.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func ValidateEndpoint(str string) (string, error) {
7474
return "", ErrorEndpointDoubleSlash(str)
7575
}
7676

77-
path := CannonicalizeEndpoint(str)
77+
path := CanonicalizeEndpoint(str)
7878

7979
if path == "/" {
8080
return "", ErrorEndpointEmptyPath()
@@ -83,7 +83,7 @@ func ValidateEndpoint(str string) (string, error) {
8383
return path, nil
8484
}
8585

86-
func CannonicalizeEndpoint(str string) string {
86+
func CanonicalizeEndpoint(str string) string {
8787
if str == "" || str == "/" {
8888
return "/"
8989
}

0 commit comments

Comments
 (0)