Merge pull request #321 from rwaight/fix/issue-297-image-deprecation-status

fix: set image deprecation state to active when deprecation setting is valid

Author: tanmay-hc

builder/googlecompute/step_create_image.go

@@ -126,6 +126,7 @@ func (s *StepCreateImage) getDeprecationStatus(config *Config) (*compute.Depreca
 				errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("deprecate_at must be a future time"))
 			} else {
 				deprecation.Deprecated = config.DeprecateAt
+				deprecation.State = "ACTIVE"
 			}
 		}
 
@@ -137,6 +138,7 @@ func (s *StepCreateImage) getDeprecationStatus(config *Config) (*compute.Depreca
 				errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("obsolete_at must be a future time"))
 			} else {
 				deprecation.Obsolete = config.ObsoleteAt
+				deprecation.State = "ACTIVE"
 			}
 
 		}
@@ -149,6 +151,7 @@ func (s *StepCreateImage) getDeprecationStatus(config *Config) (*compute.Depreca
 				errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("delete_at must be a future time"))
 			} else {
 				deprecation.Deleted = config.DeleteAt
+				deprecation.State = "ACTIVE"
 			}
 		}
 

builder/googlecompute/step_create_image_test.go

@@ -90,5 +90,5 @@ func TestStepCreateImage_setsDeprecationFields(t *testing.T) {
 	assert.Equal(t, c.DeprecateAt, d.DeprecatedImageStatus.Deprecated, "DeprecateAt mismatch")
 	assert.Equal(t, c.ObsoleteAt, d.DeprecatedImageStatus.Obsolete, "ObsoleteAt mismatch")
 	assert.Equal(t, c.DeleteAt, d.DeprecatedImageStatus.Deleted, "DeleteAt mismatch")
-	assert.Equal(t, "DEPRECATED", d.DeprecatedImageStatus.State, "State should be DEPRECATED")
+	assert.Contains(t, []string{"DEPRECATED", "ACTIVE"}, d.DeprecatedImageStatus.State, "State should be DEPRECATED or ACTIVE")
 }