fix: additional_disk space and service_integrations fields import (#1820) #1846
+262
−148
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
rriski
changed the title
byashimov
reviewed
Sep 17, 2024
| } else { | ||
| if err := d.Set("disk_space", HumanReadableByteSize(diskSpace*units.MiB)); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
nit:
if a := diskSpace - servicePlanParams.DiskSizeMBDefault; a > 0 {
...
} else if diskSpace > 0 {
...
}
byashimov
reviewed
Sep 17, 2024
internal/schemautil/service.go
Outdated
| } | ||
| return &results |
There was a problem hiding this comment.
nit:
var emails []aiven.ContactEmail
err = Remarshal(valuesInterface.(*schema.Set).List(), &emails)
byashimov
reviewed
Sep 17, 2024
| readReplicaIntegrations = append(readReplicaIntegrations, integrationMap) | ||
| } | ||
| } | ||
| return readReplicaIntegrations, nil |
There was a problem hiding this comment.
nit: This will swallow an unexpected integration type. I would set an enum validation for the integration_type field, and then the "if" can be removed.
rriski
force-pushed
the
rriski-fix-service-tf-import
branch
from
dcd341c
to
30cd706
Compare
rriski
force-pushed
the
rriski-fix-service-tf-import
branch
3 times, most recently
from
97948e1
to
4b64d51
Compare
Previously additional_disk_space field would be ignored if disk_space was not set.
We don't seem to have it in the API and its set to the same value as `disk_space`.
rriski
force-pushed
the
rriski-fix-service-tf-import
branch
from
4b64d51
to
39b861d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About this change—what it does
Fix #1820. Previously, we didn't handle
additional_disk_spaceandservice_integrationsproperly duringterraform import. This changeset also fixes importingtech_emailsfield of services.