-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[breaking] make aws provider optional (#247)
[breaking] make aws provider optional### Summary This change makes it optional to specify an aws provider. Only planning on supporting this for config v2 but it might accidentally work in v1. The only breaking change is that we now require an aws account id for the global component, where before we would silently ignore the fact that it was missing. I consider this a bug / oversight so fixing it here. ### Test Plan This diff adds a number of tests, especially golden file tests. None of the existing golden files had to be changed. ### References *
- Loading branch information
1 parent
1c1ce9b
commit 876ec2a
Showing
164 changed files
with
3,985 additions
and
289 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| package v2 | ||
|
|
||
| import ( | ||
| "github.com/chanzuckerberg/fogg/config/v1" | ||
| ) | ||
|
|
||
| // lastNonNil, despite its name can return nil if all results are nil | ||
| func lastNonNil(getter func(Common) *string, commons ...Common) *string { | ||
| var s *string | ||
| for _, c := range commons { | ||
| t := getter(c) | ||
| if t != nil { | ||
| s = t | ||
| } | ||
| } | ||
| return s | ||
| } | ||
|
|
||
| // lastNonNilInt, despite its name can return nil if all results are nil | ||
| func lastNonNilInt64(getter func(Common) *int64, commons ...Common) *int64 { | ||
| var s *int64 | ||
| for _, c := range commons { | ||
| t := getter(c) | ||
| if t != nil { | ||
| s = t | ||
| } | ||
| } | ||
| return s | ||
| } | ||
|
|
||
| // lastNonNilStringSlice, despite its name can return nil if all results are nil | ||
| func lastNonNilStringSlice(getter func(Common) []string, commons ...Common) []string { | ||
| var s []string | ||
| for _, c := range commons { | ||
| t := getter(c) | ||
| if t != nil { | ||
| s = t | ||
| } | ||
| } | ||
| return s | ||
| } | ||
|
|
||
| // ResolveRequiredString will resolve the value and panic if it is nil. Only to be used after validations are run. | ||
| func ResolveRequiredString(getter func(Common) *string, commons ...Common) string { | ||
| return *lastNonNil(getter, commons...) | ||
| } | ||
|
|
||
| // ResolveRequiredInt will resolve the value and panic if it is nil. Only to be used after validations are run. | ||
| func ResolveRequiredInt64(getter func(Common) *int64, commons ...Common) int64 { | ||
| return *lastNonNilInt64(getter, commons...) | ||
| } | ||
|
|
||
| func ResolveOptionalString(getter func(Common) *string, commons ...Common) *string { | ||
| return lastNonNil(getter, commons...) | ||
| } | ||
|
|
||
| func ResolveOptionalStringSlice(getter func(Common) []string, commons ...Common) []string { | ||
| return lastNonNilStringSlice(getter, commons...) | ||
| } | ||
|
|
||
| func ResolveStringArray(def []string, override []string) []string { | ||
| if override != nil { | ||
| return override | ||
| } | ||
| return def | ||
| } | ||
|
|
||
| func ResolveStringMap(getter func(Common) map[string]string, commons ...Common) map[string]string { | ||
| resolved := map[string]string{} | ||
|
|
||
| for _, c := range commons { | ||
| m := getter(c) | ||
| for k, v := range m { | ||
| resolved[k] = v | ||
| } | ||
| } | ||
| return resolved | ||
| } | ||
|
|
||
| // ResolveAWSProvider will return an AWSProvder iff one of the required fields is set somewhere in the set of Common | ||
| // config objects passed in. Otherwise it will return nil. | ||
| func ResolveAWSProvider(commons ...Common) *AWSProvider { | ||
|
|
||
| profile := lastNonNil(AWSProviderProfileGetter, commons...) | ||
| region := lastNonNil(AWSProviderRegionGetter, commons...) | ||
| version := lastNonNil(AWSProviderVersionGetter, commons...) | ||
|
|
||
| if profile != nil || region != nil || version != nil { | ||
| return &AWSProvider{ | ||
| Profile: profile, | ||
| Region: region, | ||
| Version: version, | ||
|
|
||
| // optional fields | ||
| AccountID: lastNonNilInt64(AWSProviderAccountIdGetter, commons...), | ||
| AdditionalRegions: ResolveOptionalStringSlice(AWSProviderAdditionalRegionsGetter, commons...), | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func OwnerGetter(comm Common) *string { | ||
| return comm.Owner | ||
| } | ||
|
|
||
| func ProjectGetter(comm Common) *string { | ||
| return comm.Project | ||
| } | ||
|
|
||
| func TerraformVersionGetter(comm Common) *string { | ||
| return comm.TerraformVersion | ||
| } | ||
|
|
||
| func BackendBucketGetter(comm Common) *string { | ||
| if comm.Backend != nil { | ||
| return comm.Backend.Bucket | ||
| } | ||
| return nil | ||
| } | ||
| func BackendRegionGetter(comm Common) *string { | ||
| if comm.Backend != nil { | ||
| return comm.Backend.Region | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func BackendDynamoTableGetter(comm Common) *string { | ||
| if comm.Backend != nil { | ||
| return comm.Backend.DynamoTable | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func BackendProfileGetter(comm Common) *string { | ||
| if comm.Backend != nil { | ||
| return comm.Backend.Profile | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func AWSProviderRegionGetter(comm Common) *string { | ||
| if comm.Providers != nil && comm.Providers.AWS != nil { | ||
| return comm.Providers.AWS.Region | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func AWSProviderVersionGetter(comm Common) *string { | ||
| if comm.Providers != nil && comm.Providers.AWS != nil { | ||
| return comm.Providers.AWS.Version | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func AWSProviderProfileGetter(comm Common) *string { | ||
| if comm.Providers != nil && comm.Providers.AWS != nil { | ||
| return comm.Providers.AWS.Profile | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func AWSProviderAccountIdGetter(comm Common) *int64 { | ||
| if comm.Providers != nil && comm.Providers.AWS != nil { | ||
| return comm.Providers.AWS.AccountID | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func AWSProviderAdditionalRegionsGetter(comm Common) []string { | ||
| if comm.Providers != nil && comm.Providers.AWS != nil { | ||
| return comm.Providers.AWS.AdditionalRegions | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func ExtraVarsGetter(comm Common) map[string]string { | ||
| if comm.ExtraVars != nil { | ||
| return comm.ExtraVars | ||
| } | ||
| return map[string]string{} | ||
| } | ||
|
|
||
| func ResolveModuleTerraformVersion(def Defaults, module v1.Module) *string { | ||
| if module.TerraformVersion != nil { | ||
| return module.TerraformVersion | ||
| } | ||
| return def.TerraformVersion | ||
| } |
Oops, something went wrong.