Skip to content

Commit a1f2a73

Browse files
committed
fix: parseProviderName
Signed-off-by: sivchari <[email protected]>
1 parent ed61d8f commit a1f2a73

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

cmd/clusterctl/client/common.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (c *clusterctlClient) getComponentsByName(ctx context.Context, provider str
6262

6363
// parseProviderName defines a utility function that parses the abbreviated syntax for name[:version].
6464
func parseProviderName(provider string) (name string, version string, err error) {
65-
t := strings.Split(strings.ToLower(provider), ":")
65+
t := strings.Split(provider, ":")
6666
if len(t) > 2 {
6767
return "", "", errors.Errorf("invalid provider name %q. Provider name should be in the form name[:version]", provider)
6868
}
@@ -71,7 +71,7 @@ func parseProviderName(provider string) (name string, version string, err error)
7171
return "", "", errors.Errorf("invalid provider name %q. Provider name should be in the form name[:version] and name cannot be empty", provider)
7272
}
7373

74-
name = t[0]
74+
name = strings.ToLower(t[0])
7575
if err := validateDNS1123Label(name); err != nil {
7676
return "", "", errors.Wrapf(err, "invalid provider name %q. Provider name should be in the form name[:version] and the name should be valid", provider)
7777
}

cmd/clusterctl/client/common_test.go

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,24 @@ func Test_parseProviderName(t *testing.T) {
5151
wantVersion: "version",
5252
wantErr: false,
5353
},
54+
{
55+
name: "name & upper case version",
56+
args: args{
57+
provider: "provider:1.0.0-VERSION",
58+
},
59+
wantName: "provider",
60+
wantVersion: "1.0.0-VERSION",
61+
wantErr: false,
62+
},
63+
{
64+
name: "upper name & version",
65+
args: args{
66+
provider: "PROVIDER:VERSION",
67+
},
68+
wantName: "provider",
69+
wantVersion: "VERSION",
70+
wantErr: false,
71+
},
5472
}
5573
for _, tt := range tests {
5674
t.Run(tt.name, func(t *testing.T) {
@@ -59,9 +77,9 @@ func Test_parseProviderName(t *testing.T) {
5977
gotName, gotVersion, err := parseProviderName(tt.args.provider)
6078
if tt.wantErr {
6179
g.Expect(err).To(HaveOccurred())
62-
} else {
63-
g.Expect(err).ToNot(HaveOccurred())
80+
return
6481
}
82+
g.Expect(err).ToNot(HaveOccurred())
6583
g.Expect(gotName).To(Equal(tt.wantName))
6684

6785
g.Expect(gotVersion).To(Equal(tt.wantVersion))

0 commit comments

Comments
 (0)