Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Tencent] Change All Error Messages to English #1053 #1054

Merged
merged 3 commits into from
Feb 7, 2024
Merged

[Tencent] Change All Error Messages to English #1053 #1054

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97bc2e4
cblogger.Info KOR to ENG
raccoon-mh Feb 7, 2024
50863b1
path removed
raccoon-mh Feb 7, 2024
c04c3a6
cblogger.Info return, KOR to ENG
raccoon-mh Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cloud-control-manager/cloud-driver/drivers/aws/AwsDriver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ func getVMClient(connectionInfo idrv.ConnectionInfo) (*ec2.EC2, error) {
//spew.Dump(connectionInfo)

sess, err := session.NewSession(&aws.Config{
Region: aws.String(connectionInfo.RegionInfo.Region),
CredentialsChainVerboseErrors: aws.Bool(true),
Region: aws.String(connectionInfo.RegionInfo.Region),
//Region: aws.String("ap-northeast-2"),
Credentials: credentials.NewStaticCredentials(connectionInfo.CredentialInfo.ClientId, connectionInfo.CredentialInfo.ClientSecret, "")},
)
Expand Down
3 changes: 3 additions & 0 deletions cloud-control-manager/cloud-driver/drivers/aws/resources/CommonHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,8 @@ func DescribeRegions(client *ec2.EC2, AllRegionsBool bool, regionName string) (*
resp, err := client.DescribeRegions(RegionsInput)
callLogInfo.ElapsedTime = call.Elapsed(callLogStart)
callogger.Info(call.String(callLogInfo))
callogger.Info("########################")
callogger.Info(resp.Regions)

if err != nil {
cblogger.Error(err)
Expand Down Expand Up @@ -762,6 +764,7 @@ func DescribeAvailabilityZones(client *ec2.EC2, AllRegionsBool bool) (*ec2.Descr
respZones, err := client.DescribeAvailabilityZones(ZonesInput)
callLogInfo.ElapsedTime = call.Elapsed(callLogStart)
callogger.Info(call.String(callLogInfo))
callogger.Info(respZones.AvailabilityZones)

if err != nil {
cblogger.Error(err)
Expand Down
9 changes: 6 additions & 3 deletions cloud-control-manager/cloud-driver/drivers/aws/resources/RegionZoneHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ type AwsRegionZoneHandler struct {
}

func (regionZoneHandler *AwsRegionZoneHandler) ListRegionZone() ([]*irs.RegionZoneInfo, error) {
responseRegions, err := DescribeRegions(regionZoneHandler.Client, true, "")

responseRegions, err := DescribeRegions(regionZoneHandler.Client, false, "")
if err != nil {
cblogger.Error(err)
return nil, err
Expand All @@ -41,8 +42,10 @@ func (regionZoneHandler *AwsRegionZoneHandler) ListRegionZone() ([]*irs.RegionZo

responseZones, err := DescribeAvailabilityZones(tempclient, true)
if err != nil {
cblogger.Errorf("AuthFailure on [%s]", *region.RegionName)
cblogger.Error(err)
cblogger.Infof("AuthFailure on [%s]", *region.RegionName)
cblogger.Infof(err.Error())
// cblogger.Errorf("AuthFailure on [%s]", *region.RegionName)
// cblogger.Error(err)
} else {
var zoneInfoList []irs.ZoneInfo
for _, zone := range responseZones.AvailabilityZones {
Expand Down
8 changes: 4 additions & 4 deletions cloud-control-manager/cloud-driver/drivers/tencent/TencentDriver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func getVmClient(connectionInfo idrv.ConnectionInfo) (*cvm.Client, error) {

zoneId := connectionInfo.RegionInfo.Zone
if len(zoneId) < 1 {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return nil, errors.New("Connection 정보에 Zone 정보가 없습니다")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • 반환 되는 에러도 영어 메시지로 부탁 드립니다.
  • 결국, 상위 계층에서 로그로 출력 가능성이 있습니다.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

더 찾아보니 21년 작업했던 드라이버에 한글 리턴이나 info, err 가 있네요..

https://github.com/cloud-barista/cb-spider/blob/master/cloud-control-manager/cloud-driver/drivers/alibaba/resources/VMSpecHandler.go

우선 위에 말씀해주셨던 부분만 수정하고, 나머지는 별도 이슈로 처리하겠습니다.

}

Expand Down Expand Up @@ -99,7 +99,7 @@ func getVpcClient(connectionInfo idrv.ConnectionInfo) (*vpc.Client, error) {

zoneId := connectionInfo.RegionInfo.Zone
if len(zoneId) < 1 {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return nil, errors.New("Connection 정보에 Zone 정보가 없습니다")
}

Expand Down Expand Up @@ -130,7 +130,7 @@ func getClbClient(connectionInfo idrv.ConnectionInfo) (*clb.Client, error) {

zoneId := connectionInfo.RegionInfo.Zone
if len(zoneId) < 1 {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return nil, errors.New("Connection 정보에 Zone 정보가 없습니다")
}

Expand Down Expand Up @@ -161,7 +161,7 @@ func getCbsClient(connectionInfo idrv.ConnectionInfo) (*cbs.Client, error) {

zoneId := connectionInfo.RegionInfo.Zone
if len(zoneId) < 1 {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return nil, errors.New("Connection 정보에 Zone 정보가 없습니다")
}

Expand Down
2 changes: 1 addition & 1 deletion cloud-control-manager/cloud-driver/drivers/tencent/resources/VMHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (vmHandler *TencentVMHandler) StartVM(vmReqInfo irs.VMReqInfo) (irs.VMInfo,
zoneId := vmHandler.Region.Zone
cblogger.Debugf("Zone : %s", zoneId)
if zoneId == "" {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return irs.VMInfo{}, errors.New("Connection 정보에 Zone 정보가 없습니다")
}

Expand Down
20 changes: 10 additions & 10 deletions cloud-control-manager/cloud-driver/drivers/tencent/resources/VMSpecHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ type TencentVmSpecHandler struct {
Client *cvm.Client
}

//@TODO : Region : zone id(Region이 아닌 zone id로 조회해야 함.)
// @TODO : Region : zone id(Region이 아닌 zone id로 조회해야 함.)
func (vmSpecHandler *TencentVmSpecHandler) ListVMSpec() ([]*irs.VMSpecInfo, error) {
//cblogger.Infof("ListVMSpec(ZoneId:[%s])", Region)

zoneId := vmSpecHandler.Region.Zone
//zoneId := Region
cblogger.Infof("Session Zone : [%s]", zoneId)
if zoneId == "" {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
return nil, errors.New("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return nil, errors.New("Connection information does not contain Zone information.")
}

callogger := call.GetLogger("HISCALL")
Expand Down Expand Up @@ -83,8 +83,8 @@ func (vmSpecHandler *TencentVmSpecHandler) GetVMSpec(Name string) (irs.VMSpecInf
//zoneId := Region
cblogger.Infof("Session Zone : [%s]", zoneId)
if zoneId == "" {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
return irs.VMSpecInfo{}, errors.New("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return irs.VMSpecInfo{}, errors.New("Connection information does not contain Zone information.")
}

callogger := call.GetLogger("HISCALL")
Expand Down Expand Up @@ -141,8 +141,8 @@ func (vmSpecHandler *TencentVmSpecHandler) ListOrgVMSpec() (string, error) {
//zoneId := Region
cblogger.Infof("Session Zone : [%s]", zoneId)
if zoneId == "" {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
return "", errors.New("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return "", errors.New("Connection information does not contain Zone information.")
}

callogger := call.GetLogger("HISCALL")
Expand Down Expand Up @@ -196,8 +196,8 @@ func (vmSpecHandler *TencentVmSpecHandler) GetOrgVMSpec(Name string) (string, er
//zoneId := Region
cblogger.Infof("Session Zone : [%s]", zoneId)
if zoneId == "" {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
return "", errors.New("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return "", errors.New("Connection information does not contain Zone information.")
}

callogger := call.GetLogger("HISCALL")
Expand Down Expand Up @@ -251,7 +251,7 @@ func (vmSpecHandler *TencentVmSpecHandler) GetOrgVMSpec(Name string) (string, er
}
}

//인스턴스 스펙 정보를 추출함
// 인스턴스 스펙 정보를 추출함
func ExtractVMSpecInfo(instanceTypeInfo *cvm.InstanceTypeConfig) irs.VMSpecInfo {
cblogger.Debugf("ExtractVMSpecInfo : SpecName:[%s]", *instanceTypeInfo.InstanceType)
//spew.Dump(instanceTypeInfo)
Expand Down
10 changes: 5 additions & 5 deletions cloud-control-manager/cloud-driver/drivers/tencent/resources/VPCHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ func (VPCHandler *TencentVPCHandler) CreateVPC(vpcReqInfo irs.VPCReqInfo) (irs.V
zoneId := VPCHandler.Region.Zone
cblogger.Infof("Zone : %s", zoneId)
if zoneId == "" {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
return irs.VPCInfo{}, errors.New("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return irs.VPCInfo{}, errors.New("Connection information does not contain Zone information.")
}

// logger for HisCall
Expand Down Expand Up @@ -124,7 +124,7 @@ func (VPCHandler *TencentVPCHandler) CreateVPC(vpcReqInfo irs.VPCReqInfo) (irs.V
return retVpcInfo, nil
}

//VPC 정보를 추출함
// VPC 정보를 추출함
func ExtractVpcDescribeInfo(vpcInfo *vpc.Vpc) irs.VPCInfo {
// cblogger.Debug("전달 받은 내용")
// spew.Dump(vpcInfo)
Expand Down Expand Up @@ -394,8 +394,8 @@ func (VPCHandler *TencentVPCHandler) AddSubnet(vpcIID irs.IID, subnetInfo irs.Su
zoneId := VPCHandler.Region.Zone
cblogger.Infof("Zone : %s", zoneId)
if zoneId == "" {
cblogger.Error("Connection 정보에 Zone 정보가 없습니다.")
return irs.VPCInfo{}, errors.New("Connection 정보에 Zone 정보가 없습니다.")
cblogger.Error("Connection information does not contain Zone information.")
return irs.VPCInfo{}, errors.New("Connection information does not contain Zone information.")
}

if subnetInfo.IId.NameId == "" {
Expand Down
Loading