scheduler_job_collection: Renamed max_retry_interval to max_recurrence_interval to better match azure #1218
Conversation
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
…ecurrence_interval to better match azure
katbyte
force-pushed
the
b-r-scheduler_job_collection
branch
from
9dfd377 to
cc2142e
Compare
katbyte
force-pushed
the
b-r-scheduler_job_collection
branch
from
cc2142e to
b243043
Compare
|
Tests pass: |
tombuildsstuff
suggested changes
May 14, 2018
| @@ -69,6 +69,7 @@ func resourceArmSchedulerJobCollection() *schema.Resource { | |||
| "quota": { | |||
| Type: schema.TypeList, | |||
| Optional: true, | |||
| MinItems: 1, | |||
There was a problem hiding this comment.
if this isn't required then this can be removed
| @@ -102,7 +102,7 @@ func dataSourceArmSchedulerJobCollectionRead(d *schema.ResourceData, meta interf | |||
| } | |||
| d.Set("state", string(properties.State)) | |||
|
|
|||
| if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota)); err != nil { | |||
| if err := d.Set("quota", flattenAzureArmSchedulerJobCollectionQuota(properties.Quota, d.Get("quota").([]interface{}))); err != nil { | |||
There was a problem hiding this comment.
in general we shouldn't access properties via d.Get in the Read method - since they can be absent when importing
| if v, ok := b["max_retry_interval"].(int); ok && v > 0 { | ||
| maxRecurrenceField = "max_retry_interval" | ||
| } //else max_recurrence_interval is in use, or we default to max_recurrence_interval | ||
| } |
There was a problem hiding this comment.
rather than doing this, we can instead just assign both of these values, since one's deprecated
| ValidateFunc: validation.IntAtLeast(1), //changes depending on the frequency, unknown maximums | ||
| Type: schema.TypeInt, | ||
| Optional: true, | ||
| Deprecated: "Renamed to match azure", |
There was a problem hiding this comment.
we can make this Computed and remove the ConflictsWith
| if v, ok := quotaBlock["max_retry_interval"].(int); ok && v > 0 { | ||
| quota.MaxRecurrence.Interval = utils.Int32(int32(v)) | ||
| } | ||
| if v, ok := quotaBlock["max_recurrence_interval"].(int); ok && v > 0 { | ||
| quota.MaxRecurrence.Interval = utils.Int32(int32(v)) | ||
| } |
There was a problem hiding this comment.
if v, ok := quotaBlock["max_recurrence_interval"]; ok {
// use the new value
quota.MaxRecurrence.Interval = utils.Int32(int32(v))
} elseif v, ok := quotaBlock["max_retry_interval"]; ok {
// use the old value
quota.MaxRecurrence.Interval = utils.Int32(int32(v))
}
|
tests pass: |
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 hashibot-feedback@hashicorp.com. Thanks! |
ghost
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.