Skip to content
This repository has been archived by the owner on Apr 9, 2021. It is now read-only.

Commit

Permalink
TER-260: Suppress diff on empty features.parameters and unexport supp…
Browse files Browse the repository at this point in the history 
…ress diff funcs
  • Loading branch information
Jordan Caussat committed Apr 24, 2018
1 parent 8f07e69 commit a1923ba
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 65 deletions.
103 changes: 51 additions & 52 deletions ghost/resource_ghost_app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func resourceGhostApp() *schema.Resource {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
DiffSuppressFunc: SuppressDiffAutoscale(),
DiffSuppressFunc: suppressDiffAutoscale(),
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Expand Down Expand Up @@ -126,9 +126,10 @@ func resourceGhostApp() *schema.Resource {
},
},
"environment_infos": {
Type: schema.TypeList,
Required: true,
MaxItems: 1,
Type: schema.TypeList,
Required: true,
MaxItems: 1,
DiffSuppressFunc: suppressDiffEnvironmentInfos(),
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"instance_profile": {
Expand All @@ -147,10 +148,9 @@ func resourceGhostApp() *schema.Resource {
Default: true,
},
"root_block_device": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
DiffSuppressFunc: SuppressDiffRootBlockDevice(),
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"size": {
Expand Down Expand Up @@ -324,7 +324,7 @@ func resourceGhostApp() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.ValidateJsonString,
DiffSuppressFunc: SuppressDiffFeatureParameters(),
DiffSuppressFunc: suppressDiffFeaturesParameters(),
},
},
},
Expand All @@ -333,7 +333,7 @@ func resourceGhostApp() *schema.Resource {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
DiffSuppressFunc: SuppressDiffLifecycleHooks(),
DiffSuppressFunc: suppressDiffLifecycleHooks(),
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"pre_buildimage": {
Expand Down Expand Up @@ -418,7 +418,7 @@ func resourceGhostApp() *schema.Resource {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
DiffSuppressFunc: SuppressDiffSafeDeployment(),
DiffSuppressFunc: suppressDiffSafeDeployment(),
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"ha_backend": {
Expand Down Expand Up @@ -790,9 +790,9 @@ func flattenGhostAppFeatures(features *[]ghost.Feature) []interface{} {
}

if feature.Parameters != nil {
params_json, err := json.Marshal(feature.Parameters)
paramsJSON, err := json.Marshal(feature.Parameters)
if err == nil {
values["parameters"] = string(params_json)
values["parameters"] = string(paramsJSON)
}
}

Expand All @@ -802,21 +802,26 @@ func flattenGhostAppFeatures(features *[]ghost.Feature) []interface{} {
return featureList
}

func SuppressDiffFeatureParameters() schema.SchemaDiffSuppressFunc {
func suppressDiffFeaturesParameters() schema.SchemaDiffSuppressFunc {
return func(k, old, new string, d *schema.ResourceData) bool {
var oldJson, newJson interface{}
isEmpty := old == "{}" && new == ""
if isEmpty {
return true
}

var oldJSON, newJSON interface{}

if err := json.Unmarshal([]byte(old), &oldJson); err != nil {
if err := json.Unmarshal([]byte(old), &oldJSON); err != nil {
log.Printf("Error loading feature parameters json: %v", err)
}

if err := json.Unmarshal([]byte(new), &newJson); err != nil {
if err := json.Unmarshal([]byte(new), &newJSON); err != nil {
log.Printf("Error loading feature parameters json: %v", err)
}

// If the new parameters structure is equivalent to the old one,
// ignores the diff during plan
return reflect.DeepEqual(oldJson, newJson)
return reflect.DeepEqual(oldJSON, newJSON)
}
}

Expand Down Expand Up @@ -1085,73 +1090,67 @@ func hasNoChangeAutoscale(k string, d *schema.ResourceData) bool {
return autoscale == nil || (autoscale.EnableMetrics &&
autoscale.Max == 0 && autoscale.Min == 0 && autoscale.Name == "")
}

func hasNoChangeLifecycleHooks(k string, d *schema.ResourceData) bool {
val, ok := d.GetOk("lifecycle_hooks")
if !ok {
return true
}
lifecycle_hooks := expandGhostAppLifecycleHooks(val.([]interface{}))
return lifecycle_hooks == nil || (lifecycle_hooks.PostBootstrap == "" &&
lifecycle_hooks.PostBuildimage == "" && lifecycle_hooks.PreBootstrap == "" &&
lifecycle_hooks.PreBuildimage == "")
lifecycleHooks := expandGhostAppLifecycleHooks(val.([]interface{}))
return lifecycleHooks == nil || (lifecycleHooks.PostBootstrap == "" &&
lifecycleHooks.PostBuildimage == "" && lifecycleHooks.PreBootstrap == "" &&
lifecycleHooks.PreBuildimage == "")
}

func hasNoChangeRootBlockDevice(k string, d *schema.ResourceData) bool {
val, ok := d.GetOk("environment_infos")
if !ok {
return true
}
environment_infos := expandGhostAppEnvironmentInfos(val.([]interface{}))
return environment_infos.RootBlockDevice == nil ||
(environment_infos.RootBlockDevice.Name == "" &&
environment_infos.RootBlockDevice.Size == 0)
environmentInfos := expandGhostAppEnvironmentInfos(val.([]interface{}))
return environmentInfos.RootBlockDevice == nil ||
(environmentInfos.RootBlockDevice.Name == "" &&
environmentInfos.RootBlockDevice.Size == 0)
}

func hasNoChangeSafeDeployment(k string, d *schema.ResourceData) bool {
val, ok := d.GetOk("safe_deployment")
if !ok {
return true
}
safe_deployment := expandGhostAppSafeDeployment(val.([]interface{}))
return safe_deployment == nil || (safe_deployment.ApiPort == 0 &&
safe_deployment.AppTagValue == "" && safe_deployment.HaBackend == "" &&
safe_deployment.LoadBalancerType == "" && safe_deployment.WaitAfterDeploy == 0 &&
safe_deployment.WaitBeforeDeploy == 0)
return false
safeDeployment := expandGhostAppSafeDeployment(val.([]interface{}))
return safeDeployment == nil || (safeDeployment.ApiPort == 0 &&
safeDeployment.AppTagValue == "" && safeDeployment.HaBackend == "" &&
safeDeployment.LoadBalancerType == "" && safeDeployment.WaitAfterDeploy == 0 &&
safeDeployment.WaitBeforeDeploy == 0)
}

// Remove plan diffs due to empty struct created by ghost
func SuppressDiffAutoscale() schema.SchemaDiffSuppressFunc {
func suppressDiffAutoscale() schema.SchemaDiffSuppressFunc {
return func(k, old, new string, d *schema.ResourceData) bool {
if k != "autoscale.#" {
return false
}
return old == "1" && new == "0" && hasNoChangeAutoscale(k, d)
return k == "autoscale.#" && old == "1" && new == "0" &&
hasNoChangeAutoscale(k, d)
}
}

func SuppressDiffRootBlockDevice() schema.SchemaDiffSuppressFunc {
func suppressDiffEnvironmentInfos() schema.SchemaDiffSuppressFunc {
return func(k, old, new string, d *schema.ResourceData) bool {
if k != "environment_infos.0.root_block_device.#" {
return false
}
return old == "1" && new == "0" && hasNoChangeRootBlockDevice(k, d)
// Check if environment_infos.root_block_device is empty
return k == "environment_infos.0.root_block_device.#" &&
old == "1" && new == "0" && hasNoChangeRootBlockDevice(k, d)
}
}

func SuppressDiffLifecycleHooks() schema.SchemaDiffSuppressFunc {
func suppressDiffLifecycleHooks() schema.SchemaDiffSuppressFunc {
return func(k, old, new string, d *schema.ResourceData) bool {
if k != "lifecycle_hooks.#" {
return false
}
return old == "1" && new == "0" && hasNoChangeLifecycleHooks(k, d)
return k == "lifecycle_hooks.#" && old == "1" && new == "0" &&
hasNoChangeLifecycleHooks(k, d)
}
}

func SuppressDiffSafeDeployment() schema.SchemaDiffSuppressFunc {
func suppressDiffSafeDeployment() schema.SchemaDiffSuppressFunc {
return func(k, old, new string, d *schema.ResourceData) bool {
if k != "safe_deployment.#" {
return false
}
return old == "1" && new == "0" && hasNoChangeSafeDeployment(k, d)
return k == "safe_deployment.#" && old == "1" && new == "0" &&
hasNoChangeSafeDeployment(k, d)
}
}
27 changes: 14 additions & 13 deletions ghost/resource_ghost_app_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1298,8 +1298,8 @@ func TestFlattenGhostSafeDeployment(t *testing.T) {
}
}

func TestSuppressDiffFeatureParameters(t *testing.T) {
suppressDiffFeatureParameters := SuppressDiffFeatureParameters()
func TestSuppressDiffFeatures(t *testing.T) {
suppressFunc := suppressDiffFeaturesParameters()

cases := []struct {
ParameterName string
Expand All @@ -1312,19 +1312,20 @@ func TestSuppressDiffFeatureParameters(t *testing.T) {
{"features.0.parameters", `{ "name" : "positive", "id" : 1 }`, `{ "id" : 1, "name" : "positive" }`, true, nil},
{"features.0.parameters", `{ "name" : "negative", "id" : 1 }`, `{ "id" : 1, "name" : "positive" }`, false, nil},
{"features.0.parameters", `{ "name" : "negative", "id" : 1 }`, `{ "name" : "positive", "id" : 1 }`, false, nil},
{"features.0.parameters", `{}`, "", true, &schema.ResourceData{}},
}

for _, tc := range cases {
output := suppressDiffFeatureParameters(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
output := suppressFunc(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
if !reflect.DeepEqual(output, tc.ExpectedOutput) {
t.Fatalf("Unexpected output from SuppressDiffFeatureParameters.\nExpected: %#v\nGiven: %#v",
tc.ExpectedOutput, output)
}
}
}

func TestSuppressDiffRootBlockDevice(t *testing.T) {
suppressDiffRootBlockDevice := SuppressDiffRootBlockDevice()
func TestSuppressDiffEnvironmentInfos(t *testing.T) {
suppressFunc := suppressDiffEnvironmentInfos()

resource := resourceGhostApp()
nonEmptyResourceData := resource.Data(&terraform.InstanceState{
Expand All @@ -1345,16 +1346,16 @@ func TestSuppressDiffRootBlockDevice(t *testing.T) {
}

for _, tc := range cases {
output := suppressDiffRootBlockDevice(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
output := suppressFunc(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
if !reflect.DeepEqual(output, tc.ExpectedOutput) {
t.Fatalf("Unexpected output from SuppressDiffRootBlockDevice.\nExpected: %#v\nGiven: %#v",
t.Fatalf("Unexpected output from SuppressDiffEnvironmentInfos.\nExpected: %#v\nGiven: %#v",
tc.ExpectedOutput, output)
}
}
}

func TestSuppressDiffAutoscale(t *testing.T) {
suppressDiffAutoscale := SuppressDiffAutoscale()
suppressFunc := suppressDiffAutoscale()

resource := resourceGhostApp()
nonEmptyResourceData := resource.Data(&terraform.InstanceState{
Expand All @@ -1376,7 +1377,7 @@ func TestSuppressDiffAutoscale(t *testing.T) {
}

for _, tc := range cases {
output := suppressDiffAutoscale(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
output := suppressFunc(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
if !reflect.DeepEqual(output, tc.ExpectedOutput) {
t.Fatalf("Unexpected output from SuppressDiffAutoscale.\nExpected: %#v\nGiven: %#v",
tc.ExpectedOutput, output)
Expand All @@ -1385,7 +1386,7 @@ func TestSuppressDiffAutoscale(t *testing.T) {
}

func TestSuppressDiffLifecycleHooks(t *testing.T) {
suppressDiffLifecycleHooks := SuppressDiffLifecycleHooks()
suppressFunc := suppressDiffLifecycleHooks()

resource := resourceGhostApp()
nonEmptyResourceData := resource.Data(&terraform.InstanceState{
Expand All @@ -1406,7 +1407,7 @@ func TestSuppressDiffLifecycleHooks(t *testing.T) {
}

for _, tc := range cases {
output := suppressDiffLifecycleHooks(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
output := suppressFunc(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
if !reflect.DeepEqual(output, tc.ExpectedOutput) {
t.Fatalf("Unexpected output from SuppressDiffLifecycleHooks.\nExpected: %#v\nGiven: %#v",
tc.ExpectedOutput, output)
Expand All @@ -1415,7 +1416,7 @@ func TestSuppressDiffLifecycleHooks(t *testing.T) {
}

func TestSuppressDiffSafeDeployment(t *testing.T) {
suppressDiffSafeDeployment := SuppressDiffSafeDeployment()
suppressFunc := suppressDiffSafeDeployment()

resource := resourceGhostApp()
nonEmptyResourceData := resource.Data(&terraform.InstanceState{
Expand All @@ -1436,7 +1437,7 @@ func TestSuppressDiffSafeDeployment(t *testing.T) {
}

for _, tc := range cases {
output := suppressDiffSafeDeployment(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
output := suppressFunc(tc.ParameterName, tc.OldValue, tc.NewValue, tc.ResourceData)
if !reflect.DeepEqual(output, tc.ExpectedOutput) {
t.Fatalf("Unexpected output from SuppressDiffSafeDeployment.\nExpected: %#v\nGiven: %#v",
tc.ExpectedOutput, output)
Expand Down

0 comments on commit a1923ba

Please sign in to comment.