Skip to content

Commit 5cab5b6

Browse files
committed
PANDARIA: Fix linter issues
1 parent 84252d7 commit 5cab5b6

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

clients/aliyun/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ import (
1010
// ECSClient is a struct that wraps the needed ALIYUNECSConfig object, and ecs.ECs which makes the actual calls to aliyun.
1111
type ECSClient struct {
1212
Client *ecs.Client
13-
ClientConfig *ALIYUNECSConfigs
13+
ClientConfig *ECSConfigs
1414
}
1515

1616
// NewECSClient is a constructor that creates an *ECSClient which a wrapper for a "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" session and
1717
// the aliyun ecs config.
1818
func NewECSClient() (*ECSClient, error) {
1919
ecsConfig := sdk.NewConfig()
20-
aliyunecsClientConfig := new(ALIYUNECSConfigs)
20+
aliyunecsClientConfig := new(ECSConfigs)
2121
config.LoadConfig(ConfigurationFileKey, aliyunecsClientConfig)
22-
credential := credentials.NewAccessKeyCredential(aliyunecsClientConfig.ALIYUNECSAccessKeyID, aliyunecsClientConfig.ALIYUNECSSecretAccessKey)
22+
credential := credentials.NewAccessKeyCredential(aliyunecsClientConfig.ECSAccessKeyID, aliyunecsClientConfig.ECSSecretAccessKey)
2323
client, err := ecs.NewClientWithOptions(aliyunecsClientConfig.Region, ecsConfig, credential)
2424
if err != nil {
2525
return nil, err

clients/aliyun/config.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ package aliyun
33
// The json/yaml config key for the ALIYUNECSConfig
44
const ConfigurationFileKey = "aliyunECSConfigs"
55

6-
// ALIYUNECSConfigs is the AWS authentication configuration for accessing and launching ec2 instances
7-
type ALIYUNECSConfigs struct {
8-
ALIYUNECSConfig []ALIYUNECSConfig `json:"aliyunECSConfig" yaml:"aliyunECSConfig"`
9-
ALIYUNECSAccessKeyID string `json:"aliyunAccessKeyID" yaml:"aliyunAccessKeyID"`
10-
ALIYUNECSSecretAccessKey string `json:"aliyunSecretAccessKey" yaml:"aliyunSecretAccessKey"`
11-
Region string `json:"region" yaml:"region"`
6+
// ECSConfigs is the AWS authentication configuration for accessing and launching ec2 instances
7+
type ECSConfigs struct {
8+
ECSConfig []ECSConfig `json:"aliyunECSConfig" yaml:"aliyunECSConfig"`
9+
ECSAccessKeyID string `json:"aliyunAccessKeyID" yaml:"aliyunAccessKeyID"`
10+
ECSSecretAccessKey string `json:"aliyunSecretAccessKey" yaml:"aliyunSecretAccessKey"`
11+
Region string `json:"region" yaml:"region"`
1212
}
1313

14-
// ALIYUNECSConfig is the instance-specific configuration needed to launch ec2 instances in AWS
15-
type ALIYUNECSConfig struct {
14+
// ECSConfig is the instance-specific configuration needed to launch ec2 instances in AWS
15+
type ECSConfig struct {
1616
ImageID string `json:"imageId" yaml:"imageId"`
1717
SSHPassword string `json:"sshPassword" yaml:"sshPassword"`
1818
SSHKeyPairName string `json:"sshKeypair" yaml:"sshKeypair"`

0 commit comments

Comments
 (0)