forked from openstack-k8s-operators/lib-common
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request openstack-k8s-operators#546 from stuggi/cert_sort_ips
[cert] Make sure DNSNames and IPAddresses are sorted
- Loading branch information
Showing
4 changed files
with
208 additions
and
1 deletion.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| Copyright 2023 Red Hat | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package net | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "net" | ||
| "sort" | ||
| ) | ||
|
|
||
| // SortIPs - Get network-attachment-definition with name in namespace | ||
| func SortIPs( | ||
| ips []string, | ||
| ) []string { | ||
| netIPs := make([]net.IP, 0, len(ips)) | ||
|
|
||
| for _, ip := range ips { | ||
| netIPs = append(netIPs, net.ParseIP(ip)) | ||
| } | ||
|
|
||
| sort.Slice(netIPs, func(i, j int) bool { | ||
| return bytes.Compare(netIPs[i], netIPs[j]) < 0 | ||
| }) | ||
|
|
||
| sortedIPs := make([]string, 0, len(netIPs)) | ||
|
|
||
| for _, ip := range netIPs { | ||
| sortedIPs = append(sortedIPs, ip.String()) | ||
| } | ||
|
|
||
| return sortedIPs | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| Copyright 2023 Red Hat | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package net | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| func TestSortIPs(t *testing.T) { | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| ips []string | ||
| want []string | ||
| }{ | ||
| { | ||
| name: "empty ip list", | ||
| ips: []string{}, | ||
| want: []string{}, | ||
| }, | ||
| { | ||
| name: "IPv4 - single ip in list", | ||
| ips: []string{"1.1.1.1"}, | ||
| want: []string{"1.1.1.1"}, | ||
| }, | ||
| { | ||
| name: "IPv4 - already sorted list", | ||
| ips: []string{"1.1.1.1", "2.2.2.2"}, | ||
| want: []string{"1.1.1.1", "2.2.2.2"}, | ||
| }, | ||
| { | ||
| name: "IPv4 - unsorted sorted list", | ||
| ips: []string{"2.2.2.2", "1.1.1.1"}, | ||
| want: []string{"1.1.1.1", "2.2.2.2"}, | ||
| }, | ||
| { | ||
| name: "IPv4 - another unsorted sorted list", | ||
| ips: []string{"2.2.2.2", "1.1.1.2", "1.1.1.1"}, | ||
| want: []string{"1.1.1.1", "1.1.1.2", "2.2.2.2"}, | ||
| }, | ||
| { | ||
| name: "IPv6 - single ip in list", | ||
| ips: []string{"fd00:bbbb::1"}, | ||
| want: []string{"fd00:bbbb::1"}, | ||
| }, | ||
| { | ||
| name: "IPv6 - already sorted list", | ||
| ips: []string{"fd00:bbbb::1", "fd00:bbbb::2"}, | ||
| want: []string{"fd00:bbbb::1", "fd00:bbbb::2"}, | ||
| }, | ||
| { | ||
| name: "IPv6 - unsorted sorted list", | ||
| ips: []string{"fd00:bbbb::2", "fd00:bbbb::1"}, | ||
| want: []string{"fd00:bbbb::1", "fd00:bbbb::2"}, | ||
| }, | ||
| { | ||
| name: "IPv6 - another unsorted sorted list", | ||
| ips: []string{"fd00:bbbb::2", "fd00:aaaa::1", "fd00:bbbb::1"}, | ||
| want: []string{"fd00:aaaa::1", "fd00:bbbb::1", "fd00:bbbb::2"}, | ||
| }, | ||
| { | ||
| name: "IPV4 and IPv6 - unsorted sorted list", | ||
| ips: []string{"fd00:bbbb::2", "fd00:aaaa::1", "fd00:bbbb::1", "1.1.1.1"}, | ||
| want: []string{"1.1.1.1", "fd00:aaaa::1", "fd00:bbbb::1", "fd00:bbbb::2"}, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| sortedIPs := SortIPs(tt.ips) | ||
| g.Expect(sortedIPs).NotTo(BeNil()) | ||
| g.Expect(sortedIPs).To(HaveLen(len(tt.want))) | ||
| g.Expect(sortedIPs).To(BeEquivalentTo(tt.want)) | ||
| }) | ||
| } | ||
| } |