diff --git a/go.mod b/go.mod index b09bfb734b..9a4dc86c32 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,7 @@ require ( k8s.io/client-go v0.19.3 k8s.io/cluster-bootstrap v0.19.3 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231011075123-3aaa10d8e8dd + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231012084845-993de02e8d38 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19 yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361 diff --git a/go.sum b/go.sum index bd0b103cca..1093c62b20 100644 --- a/go.sum +++ b/go.sum @@ -1174,8 +1174,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231011075123-3aaa10d8e8dd h1:DIRmVqdR7bA2t1cjD7Dm0Quo+sG8G6KgfHiaQtCFrsw= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231011075123-3aaa10d8e8dd/go.mod h1:2sgCN7nRPQL3woLfdgqLDd92vwAHqtlz3KKiHxC5BAw= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231012084845-993de02e8d38 h1:Amc4EnJqEXx5M3/WoYUHIKmD+MJzqaEEF5SosSCJztg= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231012084845-993de02e8d38/go.mod h1:2sgCN7nRPQL3woLfdgqLDd92vwAHqtlz3KKiHxC5BAw= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/vendor/modules.txt b/vendor/modules.txt index 7757e7b484..fffb8b41a2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1432,7 +1432,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231011075123-3aaa10d8e8dd +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231012084845-993de02e8d38 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go index 4bd34027a4..847e6c1a92 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go @@ -832,7 +832,7 @@ func (self *SRegion) CreateInstance(name string, image *SImage, instanceType str // user data if len(userData) > 0 { - params["UserData"] = base64.StdEncoding.EncodeToString([]byte(userData)) + params["UserData"] = userData } // ip address @@ -1055,7 +1055,7 @@ func (self *SRegion) ModifyInstanceAttribute(instanceId string, opts *SInstanceA params["InstanceType.Value"] = opts.InstanceType } if len(opts.UserData) > 0 { - params["UserData.Value"] = base64.StdEncoding.Strict().EncodeToString([]byte(opts.UserData)) + params["UserData.Value"] = opts.UserData } if opts.DisableApiTermination != nil { params["DisableApiTermination.Value"] = fmt.Sprintf("%v", opts.DisableApiTermination) diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/cloudgroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/cloudgroup.go index 62a09c85b9..3af489033d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/cloudgroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/cloudgroup.go @@ -21,6 +21,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/util/pinyinutils" "yunion.io/x/cloudmux/pkg/cloudprovider" ) @@ -192,16 +193,10 @@ func (self *SAzureClient) DeleteGroup(id string) error { func (self *SAzureClient) CreateGroup(name, desc string) (*SCloudgroup, error) { params := map[string]interface{}{ "displayName": name, + "mailNickname": pinyinutils.Text2Pinyin(name), "mailEnabled": false, "securityEnabled": true, } - nickName := "" - for _, s := range name { - if s >= 0 && s <= 127 { - nickName += string(s) - } - } - params["mailNickname"] = nickName if len(desc) > 0 { params["Description"] = desc }