forked from yunionio/ocadm
-
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 yunionio#34 from zexi/hotfix/get-image-info
fix getRepoImageName parse sha256 tag
- Loading branch information
Showing
20 changed files
with
1,088 additions
and
542 deletions.
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
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,66 @@ | ||
| package cluster | ||
|
|
||
| import "testing" | ||
|
|
||
| func Test_getRepoImageName(t *testing.T) { | ||
| type args struct { | ||
| img string | ||
| } | ||
| tests := []struct { | ||
| name string | ||
| args args | ||
| want string | ||
| want1 string | ||
| want2 string | ||
| }{ | ||
| { | ||
| "yunion/image", | ||
| args{"yunion/image"}, | ||
| "yunion", | ||
| "image", | ||
| "latest", | ||
| }, | ||
| { | ||
| "hub.docker.io/yunion/image:v2", | ||
| args{"hub.docker.io/yunion/image:v2"}, | ||
| "hub.docker.io/yunion", | ||
| "image", | ||
| "v2", | ||
| }, | ||
| { | ||
| "hub.docker.io/yunion/image:v2", | ||
| args{"hub.docker.io/yunion/image:v2"}, | ||
| "hub.docker.io/yunion", | ||
| "image", | ||
| "v2", | ||
| }, | ||
| { | ||
| "10.168.222.173:8082/yunion/image:v2", | ||
| args{"10.168.222.173:8082/yunion/image:v2"}, | ||
| "10.168.222.173:8082/yunion", | ||
| "image", | ||
| "v2", | ||
| }, | ||
| { | ||
| "registry.cn-beijing.aliyuncs.com/yunionio/climc@sha256:32dcddaa6271b8c752bd6574c789771d38315076ce300c4a1d4618496e359f2d", | ||
| args{"registry.cn-beijing.aliyuncs.com/yunionio/climc@sha256:32dcddaa6271b8c752bd6574c789771d38315076ce300c4a1d4618496e359f2d"}, | ||
| "registry.cn-beijing.aliyuncs.com/yunionio", | ||
| "climc", | ||
| "", | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| got, got1, got2, _ := getRepoImageName(tt.args.img) | ||
| if got != tt.want { | ||
| t.Errorf("getRepoImageName() got = %v, want %v", got, tt.want) | ||
| } | ||
| if got1 != tt.want1 { | ||
| t.Errorf("getRepoImageName() got1 = %v, want %v", got1, tt.want1) | ||
| } | ||
| if got2 != tt.want2 { | ||
| t.Errorf("getRepoImageName() got2 = %v, want %v", got2, tt.want2) | ||
| } | ||
| }) | ||
| } | ||
| } |
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
2 changes: 1 addition & 1 deletion
2
vendor/yunion.io/x/onecloud-operator/pkg/apis/onecloud/v1alpha1/defaults.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
vendor/yunion.io/x/onecloud-operator/pkg/manager/component/component.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
10 changes: 10 additions & 0 deletions
10
vendor/yunion.io/x/onecloud-operator/pkg/manager/component/host.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
43 changes: 9 additions & 34 deletions
43
vendor/yunion.io/x/onecloud-operator/pkg/manager/component/sync.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
vendor/yunion.io/x/onecloud-operator/pkg/manager/component/utils.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
52 changes: 52 additions & 0 deletions
52
vendor/yunion.io/x/onecloud-operator/pkg/util/image/reference.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
16 changes: 12 additions & 4 deletions
16
vendor/yunion.io/x/onecloud/pkg/apis/cloudprovider/zz_generated.model.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.