github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Style: Aws -> AWS

Browse Source
This commit is contained in:
Justin Santa Barbara 2015-04-09 06:29:57 -07:00
parent 2afc1840b6
commit 98c9ebbc50
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/cloudprovider/aws/aws.go
View File

@ -90,7 +90,7 @@ type AWSCloud struct {
region aws.Region region aws.Region
// The AWS instance that we are running on // The AWS instance that we are running on
selfAwsInstance *awsInstance selfAWSInstance *awsInstance
mutex sync.Mutex mutex sync.Mutex
} }
@ -602,7 +602,7 @@ type awsInstance struct {
deviceMappings map[string]string deviceMappings map[string]string
} }
func newAwsInstance(ec2 EC2, awsID string) *awsInstance { func newAWSInstance(ec2 EC2, awsID string) *awsInstance {
self := &awsInstance{ec2: ec2, awsID: awsID} self := &awsInstance{ec2: ec2, awsID: awsID}
// We lazy-init deviceMappings // We lazy-init deviceMappings
@ -724,7 +724,7 @@ type awsDisk struct {
az string az string
} }
func newAwsDisk(ec2 EC2, name string) (*awsDisk, error) { func newAWSDisk(ec2 EC2, name string) (*awsDisk, error) {
// name looks like aws://availability-zone/id // name looks like aws://availability-zone/id
url, err := url.Parse(name) url, err := url.Parse(name)
if err != nil { if err != nil {
@ -820,20 +820,20 @@ func (self *awsDisk) delete() error {
// Gets the awsInstance for the EC2 instance on which we are running // Gets the awsInstance for the EC2 instance on which we are running
// may return nil in case of error // may return nil in case of error
func (aws *AWSCloud) getSelfAwsInstance() (*awsInstance, error) { func (aws *AWSCloud) getSelfAWSInstance() (*awsInstance, error) {
// Note that we cache some state in awsInstance (mountpoints), so we must preserve the instance // Note that we cache some state in awsInstance (mountpoints), so we must preserve the instance
aws.mutex.Lock() aws.mutex.Lock()
defer aws.mutex.Unlock() defer aws.mutex.Unlock()
i := aws.selfAwsInstance i := aws.selfAWSInstance
if i == nil { if i == nil {
instanceIdBytes, err := aws.metadata.GetMetaData("instance-id") instanceIdBytes, err := aws.metadata.GetMetaData("instance-id")
if err != nil { if err != nil {
return nil, fmt.Errorf("error fetching instance-id from ec2 metadata service: %v", err) return nil, fmt.Errorf("error fetching instance-id from ec2 metadata service: %v", err)
} }
i = newAwsInstance(aws.ec2, string(instanceIdBytes)) i = newAWSInstance(aws.ec2, string(instanceIdBytes))
aws.selfAwsInstance = i aws.selfAWSInstance = i
} }
return i, nil return i, nil
@ -841,14 +841,14 @@ func (aws *AWSCloud) getSelfAwsInstance() (*awsInstance, error) {
// Implements Volumes.AttachDisk // Implements Volumes.AttachDisk
func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly bool) (string, error) { func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly bool) (string, error) {
disk, err := newAwsDisk(aws.ec2, diskName) disk, err := newAWSDisk(aws.ec2, diskName)
if err != nil { if err != nil {
return "", err return "", err
} }
var awsInstance *awsInstance var awsInstance *awsInstance
if instanceName == "" { if instanceName == "" {
awsInstance, err = aws.getSelfAwsInstance() awsInstance, err = aws.getSelfAWSInstance()
if err != nil { if err != nil {
return "", fmt.Errorf("Error getting self-instance: %v", err) return "", fmt.Errorf("Error getting self-instance: %v", err)
} }
@ -858,7 +858,7 @@ func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly b
return "", fmt.Errorf("Error finding instance: %v", err) return "", fmt.Errorf("Error finding instance: %v", err)
} }
awsInstance = newAwsInstance(aws.ec2, instance.InstanceId) awsInstance = newAWSInstance(aws.ec2, instance.InstanceId)
} }
if readOnly { if readOnly {
@ -906,7 +906,7 @@ func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly b
// Implements Volumes.DetachDisk // Implements Volumes.DetachDisk
func (aws *AWSCloud) DetachDisk(instanceName string, diskName string) error { func (aws *AWSCloud) DetachDisk(instanceName string, diskName string) error {
disk, err := newAwsDisk(aws.ec2, diskName) disk, err := newAWSDisk(aws.ec2, diskName)
if err != nil { if err != nil {
return err return err
} }
@ -947,7 +947,7 @@ func (aws *AWSCloud) CreateVolume(volumeOptions *VolumeOptions) (string, error)
// Implements Volumes.DeleteVolume // Implements Volumes.DeleteVolume
func (aws *AWSCloud) DeleteVolume(volumeName string) error { func (aws *AWSCloud) DeleteVolume(volumeName string) error {
awsDisk, err := newAwsDisk(aws.ec2, volumeName) awsDisk, err := newAWSDisk(aws.ec2, volumeName)
if err != nil { if err != nil {
return err return err
} }