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
1ab6569d
Commit
1ab6569d
authored
Jan 25, 2019
by
ampsingram
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
format changes
parent
28d37740
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
aws.go
pkg/cloudprovider/providers/aws/aws.go
+2
-2
aws_test.go
pkg/cloudprovider/providers/aws/aws_test.go
+6
-6
No files found.
pkg/cloudprovider/providers/aws/aws.go
View file @
1ab6569d
...
@@ -615,14 +615,14 @@ func (cfg *CloudConfig) validateOverrides() error {
...
@@ -615,14 +615,14 @@ func (cfg *CloudConfig) validateOverrides() error {
ovrd
.
Region
=
region
ovrd
.
Region
=
region
url
:=
strings
.
TrimSpace
(
ovrd
.
URL
)
url
:=
strings
.
TrimSpace
(
ovrd
.
URL
)
if
url
==
""
{
if
url
==
""
{
return
fmt
.
Errorf
(
"url is missing [URL is
\"\"
] in override %s"
,
onum
)
return
fmt
.
Errorf
(
"url is missing [URL is
\"\"
] in override %s"
,
onum
)
}
}
signingRegion
:=
strings
.
TrimSpace
(
ovrd
.
SigningRegion
)
signingRegion
:=
strings
.
TrimSpace
(
ovrd
.
SigningRegion
)
if
signingRegion
==
""
{
if
signingRegion
==
""
{
return
fmt
.
Errorf
(
"signingRegion is missing [SigningRegion is
\"\"
] in override %s"
,
onum
)
return
fmt
.
Errorf
(
"signingRegion is missing [SigningRegion is
\"\"
] in override %s"
,
onum
)
}
}
signature
:=
name
+
"_"
+
region
signature
:=
name
+
"_"
+
region
if
set
[
signature
]
{
if
set
[
signature
]
{
return
fmt
.
Errorf
(
"duplicate entry found for service override [%s] (%s in %s)"
,
onum
,
name
,
region
)
return
fmt
.
Errorf
(
"duplicate entry found for service override [%s] (%s in %s)"
,
onum
,
name
,
region
)
}
}
...
...
pkg/cloudprovider/providers/aws/aws_test.go
View file @
1ab6569d
...
@@ -187,8 +187,8 @@ func TestReadAWSCloudConfig(t *testing.T) {
...
@@ -187,8 +187,8 @@ func TestReadAWSCloudConfig(t *testing.T) {
}
}
type
ServiceDescriptor
struct
{
type
ServiceDescriptor
struct
{
name
string
name
string
region
string
region
string
signingRegion
,
signingMethod
string
signingRegion
,
signingMethod
string
}
}
...
@@ -309,7 +309,7 @@ func TestOverridesActiveConfig(t *testing.T) {
...
@@ -309,7 +309,7 @@ func TestOverridesActiveConfig(t *testing.T) {
SigningMethod = v4`
),
SigningMethod = v4`
),
nil
,
nil
,
false
,
true
,
false
,
true
,
[]
ServiceDescriptor
{{
name
:
"s3"
,
region
:
"sregion1"
,
signingRegion
:
"sregion1"
,
signingMethod
:
"v4"
},
[]
ServiceDescriptor
{{
name
:
"s3"
,
region
:
"sregion1"
,
signingRegion
:
"sregion1"
,
signingMethod
:
"v4"
},
{
name
:
"ec2"
,
region
:
"sregion2"
,
signingRegion
:
"sregion2"
,
signingMethod
:
"v4"
}},
{
name
:
"ec2"
,
region
:
"sregion2"
,
signingRegion
:
"sregion2"
,
signingMethod
:
"v4"
}},
},
},
{
{
...
@@ -356,7 +356,7 @@ func TestOverridesActiveConfig(t *testing.T) {
...
@@ -356,7 +356,7 @@ func TestOverridesActiveConfig(t *testing.T) {
nil
,
nil
,
false
,
true
,
false
,
true
,
[]
ServiceDescriptor
{{
name
:
"s3"
,
region
:
"region1"
,
signingRegion
:
"sregion1"
,
signingMethod
:
""
},
[]
ServiceDescriptor
{{
name
:
"s3"
,
region
:
"region1"
,
signingRegion
:
"sregion1"
,
signingMethod
:
""
},
{
name
:
"ec2"
,
region
:
"region2"
,
signingRegion
:
"sregion"
,
signingMethod
:
"v4"
}},
{
name
:
"ec2"
,
region
:
"region2"
,
signingRegion
:
"sregion"
,
signingMethod
:
"v4"
}},
},
},
{
{
"Multiple regions, Same Service"
,
"Multiple regions, Same Service"
,
...
@@ -380,8 +380,8 @@ func TestOverridesActiveConfig(t *testing.T) {
...
@@ -380,8 +380,8 @@ func TestOverridesActiveConfig(t *testing.T) {
`
),
`
),
nil
,
nil
,
false
,
true
,
false
,
true
,
[]
ServiceDescriptor
{{
name
:
"s3"
,
region
:
"region1"
,
signingRegion
:
"sregion1"
,
signingMethod
:
"v3"
},
[]
ServiceDescriptor
{{
name
:
"s3"
,
region
:
"region1"
,
signingRegion
:
"sregion1"
,
signingMethod
:
"v3"
},
{
name
:
"s3"
,
region
:
"region2"
,
signingRegion
:
"sregion1"
,
signingMethod
:
"v4"
}},
{
name
:
"s3"
,
region
:
"region2"
,
signingRegion
:
"sregion1"
,
signingMethod
:
"v4"
}},
},
},
}
}
...
...
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