Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
89d7eb05
Commit
89d7eb05
authored
Nov 24, 2015
by
Trevor Pounds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update AWS cloud provider to aws-sdk-go v1.0.2.
parent
bd9adaf8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
aws.go
pkg/cloudprovider/providers/aws/aws.go
+8
-7
log_handler.go
pkg/cloudprovider/providers/aws/log_handler.go
+1
-1
No files found.
pkg/cloudprovider/providers/aws/aws.go
View file @
89d7eb05
...
@@ -35,6 +35,7 @@ import (
...
@@ -35,6 +35,7 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/autoscaling"
"github.com/aws/aws-sdk-go/service/autoscaling"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/elb"
"github.com/aws/aws-sdk-go/service/elb"
...
@@ -224,10 +225,10 @@ func addHandlers(h *request.Handlers) {
...
@@ -224,10 +225,10 @@ func addHandlers(h *request.Handlers) {
}
}
func
(
p
*
awsSDKProvider
)
Compute
(
regionName
string
)
(
EC2
,
error
)
{
func
(
p
*
awsSDKProvider
)
Compute
(
regionName
string
)
(
EC2
,
error
)
{
service
:=
ec2
.
New
(
&
aws
.
Config
{
service
:=
ec2
.
New
(
session
.
New
(
&
aws
.
Config
{
Region
:
&
regionName
,
Region
:
&
regionName
,
Credentials
:
p
.
creds
,
Credentials
:
p
.
creds
,
})
})
)
addHandlers
(
&
service
.
Handlers
)
addHandlers
(
&
service
.
Handlers
)
...
@@ -238,10 +239,10 @@ func (p *awsSDKProvider) Compute(regionName string) (EC2, error) {
...
@@ -238,10 +239,10 @@ func (p *awsSDKProvider) Compute(regionName string) (EC2, error) {
}
}
func
(
p
*
awsSDKProvider
)
LoadBalancing
(
regionName
string
)
(
ELB
,
error
)
{
func
(
p
*
awsSDKProvider
)
LoadBalancing
(
regionName
string
)
(
ELB
,
error
)
{
elbClient
:=
elb
.
New
(
&
aws
.
Config
{
elbClient
:=
elb
.
New
(
session
.
New
(
&
aws
.
Config
{
Region
:
&
regionName
,
Region
:
&
regionName
,
Credentials
:
p
.
creds
,
Credentials
:
p
.
creds
,
})
})
)
addHandlers
(
&
elbClient
.
Handlers
)
addHandlers
(
&
elbClient
.
Handlers
)
...
@@ -249,10 +250,10 @@ func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) {
...
@@ -249,10 +250,10 @@ func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) {
}
}
func
(
p
*
awsSDKProvider
)
Autoscaling
(
regionName
string
)
(
ASG
,
error
)
{
func
(
p
*
awsSDKProvider
)
Autoscaling
(
regionName
string
)
(
ASG
,
error
)
{
client
:=
autoscaling
.
New
(
&
aws
.
Config
{
client
:=
autoscaling
.
New
(
session
.
New
(
&
aws
.
Config
{
Region
:
&
regionName
,
Region
:
&
regionName
,
Credentials
:
p
.
creds
,
Credentials
:
p
.
creds
,
})
})
)
addHandlers
(
&
client
.
Handlers
)
addHandlers
(
&
client
.
Handlers
)
...
@@ -335,7 +336,7 @@ func (self *awsSdkEC2) DescribeInstances(request *ec2.DescribeInstancesInput) ([
...
@@ -335,7 +336,7 @@ func (self *awsSdkEC2) DescribeInstances(request *ec2.DescribeInstancesInput) ([
}
}
type
awsSdkMetadata
struct
{
type
awsSdkMetadata
struct
{
metadata
*
ec2metadata
.
Client
metadata
*
ec2metadata
.
EC2Metadata
}
}
var
metadataClient
=
http
.
Client
{
var
metadataClient
=
http
.
Client
{
...
...
pkg/cloudprovider/providers/aws/log_handler.go
View file @
89d7eb05
...
@@ -23,7 +23,7 @@ import (
...
@@ -23,7 +23,7 @@ import (
// Handler for aws-sdk-go that logs all requests
// Handler for aws-sdk-go that logs all requests
func
awsHandlerLogger
(
req
*
request
.
Request
)
{
func
awsHandlerLogger
(
req
*
request
.
Request
)
{
service
:=
req
.
Service
.
ServiceName
service
:=
req
.
ClientInfo
.
ServiceName
name
:=
"?"
name
:=
"?"
if
req
.
Operation
!=
nil
{
if
req
.
Operation
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment