[Feat] DDM: Add resource ddm v1 #2692
Merged
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
muneeb-jan
force-pushed
the
add-ddm-instance-schema
branch
from
5a988ab to
95d5481
Compare
muneeb-jan
requested review from
anton-sidelnikov,
artem-lifshits and
vladimirvshivkov
anton-sidelnikov
requested changes
Oct 29, 2024
| "log" | ||
| "unicode" | ||
|
|
||
| // "reflect" |
Comment on lines
51
to
56
| "region": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| Computed: true, | ||
| ForceNew: true, | ||
| }, |
There was a problem hiding this comment.
please move it to computed only, we don't use region in createOpts
Comment on lines
375
to
430
| func isValidateName(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| // Check length between 4 and 64 | ||
| if len(value) > 64 || len(value) < 4 { | ||
| errors = append(errors, fmt.Errorf("%q must contain more than 4 and less than 64 characters", k)) | ||
| } | ||
|
|
||
| // Check if contains invalid character | ||
| pattern := `^[\-A-Za-z0-9]+$` | ||
| if !regexp.MustCompile(pattern).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf("only alphanumeric characters, and hyphens allowed in %q", k)) | ||
| } | ||
|
|
||
| // Check if doesn't start with a letter | ||
| if !unicode.IsLetter(rune(value[0])) { | ||
| errors = append(errors, fmt.Errorf("%q must start with a letter", k)) | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| func isValidUTCOffset(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| // Regular expression pattern for matching UTC offsets from +12:00 to -12:00 | ||
| pattern := `^(UTC([+-](0[1-9]|1[0-2]):00)|UTC)$` | ||
|
|
||
| // Compile the regular expression | ||
| re := regexp.MustCompile(pattern) | ||
| if !re.MatchString(value) { | ||
| errors = append(errors, fmt.Errorf("only valid utc offsets allowed in %q", k)) | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // Checks if the admin username is valid. | ||
| func isValidUsername(v interface{}, k string) (ws []string, errors []error) { | ||
| value := v.(string) | ||
| // Check length between 1 and 32 | ||
| if len(value) > 32 || len(value) < 1 { | ||
| errors = append(errors, fmt.Errorf("%q must contain more than 1 and less than 32 characters", k)) | ||
| } | ||
|
|
||
| // Check if contains invalid character | ||
| pattern := `^[\_A-Za-z0-9]+$` | ||
| if !regexp.MustCompile(pattern).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf("only alphanumeric characters, and underscores allowed in %q", k)) | ||
| } | ||
|
|
||
| // Check if doesn't start with a letter | ||
| if !unicode.IsLetter(rune(value[0])) { | ||
| errors = append(errors, fmt.Errorf("%q must start with a letter", k)) | ||
| } | ||
|
|
||
| return | ||
| } |
There was a problem hiding this comment.
for all this validations we have opentelekomcloud/common/validators.go
Comment on lines
282
to
285
| if err := mErr.ErrorOrNil(); err != nil { | ||
| return diag.FromErr(err) | ||
| } | ||
| return nil |
There was a problem hiding this comment.
you can also chage this to return diag.FromErr(mErr.ErrorOrNil())
| deleteRdsData := d.Get("purge_rds_on_delete").(bool) | ||
| _, err = ddmv1instances.Delete(client, d.Id(), deleteRdsData) | ||
| if err != nil { | ||
| return fmterr.Errorf("error deleting OpenTelekomCloud RDSv3 instance: %s", err) |
docs/resources/ddm_instance_v1.md
Outdated
|
|
||
| The following arguments are supported: | ||
|
|
||
| * `region` - (Optional, String, ForceNew) Specifies the region of the DDM instance. |
There was a problem hiding this comment.
move this to attributes
docs/resources/ddm_instance_v1.md
Outdated
Comment on lines
161
to
168
| Following attributes are not properly imported. | ||
| * `availability_zones` | ||
| * `flavor_id` | ||
| * `engine_id` | ||
| * `time_zone` | ||
| * `password` | ||
| * `param_group_id` | ||
| * `purge_rds_on_delete` |
There was a problem hiding this comment.
Change for:
Notes
But due to some attributes missing from the API response, it's required to ignore changes as below:
resource "opentelekomcloud_ddm_instance_v1" "instance_1" {
# ...
lifecycle {
ignore_changes = [
availability_zones,
flavor_id,
engine_id,
time_zone,
password,
]
}
}
anton-sidelnikov
requested changes
Oct 29, 2024
opentelekomcloud/services/ddm/resource_opentelekomcloud_ddm_instance_v1.go
Show resolved
Hide resolved
opentelekomcloud/services/ddm/resource_opentelekomcloud_ddm_instance_v1.go
Show resolved
Hide resolved
anton-sidelnikov
approved these changes
Oct 31, 2024
|
Build succeeded. ✔️ build-otc-releasenotes SUCCESS in 4m 08s |
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.
Summary of the Pull Request
Adds DDM instance resource to OTC provider
PR Checklist
Acceptance Steps Performed