Skip to content
This repository was archived by the owner on Jun 23, 2020. It is now read-only.

Fixes #12 don't require region w/ instance principals #135

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes #12 don't require region w/ instance principals #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df9af0
Fixes #12 don't require region w/ instance principals
jhorwit2 Jul 9, 2018
b07c122
fix test
jhorwit2 Jul 9, 2018
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: 0 additions & 3 deletions pkg/oci/client/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@ func validateAuthConfig(c *Config, fldPath *field.Path) field.ErrorList {
errList := field.ErrorList{}

if c.UseInstancePrincipals {
if c.Auth.Region != "" {
errList = append(errList, field.Forbidden(fldPath.Child("region"), "cannot be used when useInstancePrincipals is enabled"))
}
if c.Auth.TenancyOCID != "" {
errList = append(errList, field.Forbidden(fldPath.Child("tenancy"), "cannot be used when useInstancePrincipals is enabled"))
}
Expand Down
1 change: 0 additions & 1 deletion pkg/oci/client/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ func TestValidateConfig(t *testing.T) {
},
},
errs: field.ErrorList{
&field.Error{Type: field.ErrorTypeForbidden, Field: "auth.region", Detail: "cannot be used when useInstancePrincipals is enabled", BadValue: ""},
&field.Error{Type: field.ErrorTypeForbidden, Field: "auth.tenancy", Detail: "cannot be used when useInstancePrincipals is enabled", BadValue: ""},
&field.Error{Type: field.ErrorTypeForbidden, Field: "auth.user", Detail: "cannot be used when useInstancePrincipals is enabled", BadValue: ""},
&field.Error{Type: field.ErrorTypeForbidden, Field: "auth.key", Detail: "cannot be used when useInstancePrincipals is enabled", BadValue: ""},
Expand Down