resource/aws_lambda_alias: Support Traffic Shifting #3316
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "log" | ||
| "strings" | ||
|
|
@@ -39,6 +40,20 @@ func resourceAwsLambdaAlias() *schema.Resource { | |
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "routing_config": { | ||
| Type: schema.TypeList, | ||
| Optional: true, | ||
| MaxItems: 1, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "additional_version_weights": { | ||
| Type: schema.TypeMap, | ||
| Optional: true, | ||
| Elem: schema.TypeFloat, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
@@ -58,6 +73,20 @@ func resourceAwsLambdaAliasCreate(d *schema.ResourceData, meta interface{}) erro | |
| FunctionName: aws.String(functionName), | ||
| FunctionVersion: aws.String(d.Get("function_version").(string)), | ||
| Name: aws.String(aliasName), | ||
| RoutingConfig: &lambda.AliasRoutingConfiguration{}, | ||
|
There was a problem hiding this comment. Including the optional and empty func expandLambdaAliasRoutingConfiguration(l []interface{}) *lambda.AliasRoutingConfiguration {
aliasRoutingConfiguration := &lambda.AliasRoutingConfiguration{}
if len(l) == 0 || l[0] == nil {
return aliasRoutingConfiguration
}
m := l[0].(map[string]interface{})
if v, ok := m["additional_version_weights"]; ok {
aliasRoutingConfiguration.AdditionalVersionWeights = expandFloat64Map(weights)
}
return aliasRoutingConfiguration
}
// this should live in structure.go near expandStringList and replace readAdditionalVersionWeights
func expandFloat64Map(m map[string]interface{}) map[string]*float64 {
float64Map := make(map[string]*float64, len(m))
for k, v := range m {
float64Map[k] = aws.Float64(v.(float64))
}
return float64Map
}and called in create/update via: |
||
| } | ||
|
|
||
| if v, ok := d.GetOk("routing_config"); ok { | ||
| routingConfigs := v.([]interface{}) | ||
| routingConfig, ok := routingConfigs[0].(map[string]interface{}) | ||
| if !ok { | ||
| return errors.New("At least one field is expected inside routing_config") | ||
| } | ||
|
|
||
| if additionalVersionWeights, ok := routingConfig["additional_version_weights"]; ok { | ||
| weights := readAdditionalVersionWeights(additionalVersionWeights.(map[string]interface{})) | ||
| params.RoutingConfig.AdditionalVersionWeights = aws.Float64Map(weights) | ||
| } | ||
| } | ||
|
|
||
| aliasConfiguration, err := conn.CreateAlias(params) | ||
|
|
@@ -97,6 +126,7 @@ func resourceAwsLambdaAliasRead(d *schema.ResourceData, meta interface{}) error | |
| d.Set("function_version", aliasConfiguration.FunctionVersion) | ||
| d.Set("name", aliasConfiguration.Name) | ||
| d.Set("arn", aliasConfiguration.AliasArn) | ||
| d.Set("routing_config", aliasConfiguration.RoutingConfig) | ||
|
There was a problem hiding this comment. When using if err := d.Set("routing_config", aliasConfiguration.RoutingConfig); err != nil {
return fmt.Errorf("error setting routing_config: %s", err)
}Without this check and if there is a type conversion error, Terraform is silently accepting the configuration "as-is" into the Terraform state and unable to detect drift from the API should changes occur outside Terraform. After adding this error checking, you should start receiving type errors as func flattenLambdaAliasRoutingConfiguration(arc *lambda.AliasRoutingConfiguration) []interface{} {
if arc == nil {
return []interface{}{}
}
m := map[string]interface{}{
"additional_version_weights": aws.Float64ValueMap(arc.AdditionalVersionWeights)
}
return []interface{}{m}
}Which can be referenced via: |
||
|
|
||
| return nil | ||
| } | ||
|
|
@@ -135,6 +165,20 @@ func resourceAwsLambdaAliasUpdate(d *schema.ResourceData, meta interface{}) erro | |
| FunctionName: aws.String(d.Get("function_name").(string)), | ||
| FunctionVersion: aws.String(d.Get("function_version").(string)), | ||
| Name: aws.String(d.Get("name").(string)), | ||
| RoutingConfig: &lambda.AliasRoutingConfiguration{}, | ||
| } | ||
|
|
||
| if v, ok := d.GetOk("routing_config"); ok { | ||
| routingConfigs := v.([]interface{}) | ||
| routingConfig, ok := routingConfigs[0].(map[string]interface{}) | ||
| if !ok { | ||
| return errors.New("At least one field is expected inside routing_config") | ||
| } | ||
|
|
||
| if additionalVersionWeights, ok := routingConfig["additional_version_weights"]; ok { | ||
| weights := readAdditionalVersionWeights(additionalVersionWeights.(map[string]interface{})) | ||
| params.RoutingConfig.AdditionalVersionWeights = aws.Float64Map(weights) | ||
| } | ||
| } | ||
|
|
||
| _, err := conn.UpdateAlias(params) | ||
|
|
@@ -144,3 +188,12 @@ func resourceAwsLambdaAliasUpdate(d *schema.ResourceData, meta interface{}) erro | |
|
|
||
| return nil | ||
| } | ||
|
|
||
| func readAdditionalVersionWeights(avw map[string]interface{}) map[string]float64 { | ||
| weights := make(map[string]float64) | ||
| for k, v := range avw { | ||
| weights[k] = v.(float64) | ||
| } | ||
|
|
||
| return weights | ||
| } | ||
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
Binary file not shown.
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While this still works today,
Elemshould only contain*schema.Schemaor*schema.Resource👍 In this case, it can be fixed with: