Skip to content

Commit

Permalink
Drop handling of deprecated parameters
Browse files Browse the repository at this point in the history 
We deprecated server id, query cache and bin log
related fields in the parameters for mysql 8.0
  • Loading branch information
@ajfriesen
ajfriesen committed Dec 12, 2023
1 parent a05d700 commit 0a7febf
Showing 1 changed file with 0 additions and 70 deletions.
70 changes: 0 additions & 70 deletions gridscale/resource_gridscale_mysql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,33 +296,15 @@ func resourceGridscaleMySQLRead(d *schema.ResourceData, meta interface{}) error
}

// Set MySQL parameters
if err = d.Set("mysql_log_bin", props.Parameters["mysql_log_bin"]); err != nil {
return fmt.Errorf("%s error setting mysql_log_bin: %v", errorPrefix, err)
}
if err = d.Set("mysql_sql_mode", props.Parameters["mysql_sql_mode"]); err != nil {
return fmt.Errorf("%s error setting mysql_sql_mode: %v", errorPrefix, err)
}
if err = d.Set("mysql_server_id", props.Parameters["mysql_server_id"]); err != nil {
return fmt.Errorf("%s error setting mysql_server_id: %v", errorPrefix, err)
}
if err = d.Set("mysql_query_cache", props.Parameters["mysql_query_cache"]); err != nil {
return fmt.Errorf("%s error setting mysql_query_cache: %v", errorPrefix, err)
}
if err = d.Set("mysql_binlog_format", props.Parameters["mysql_binlog_format"]); err != nil {
return fmt.Errorf("%s error setting mysql_binlog_format: %v", errorPrefix, err)
}
if err = d.Set("mysql_max_connections", props.Parameters["mysql_max_connections"]); err != nil {
return fmt.Errorf("%s error setting mysql_max_connections: %v", errorPrefix, err)
}
if err = d.Set("mysql_query_cache_size", props.Parameters["mysql_query_cache_size"]); err != nil {
return fmt.Errorf("%s error setting mysql_query_cache_size: %v", errorPrefix, err)
}
if err = d.Set("mysql_default_time_zone", props.Parameters["mysql_default_time_zone"]); err != nil {
return fmt.Errorf("%s error setting mysql_default_time_zone: %v", errorPrefix, err)
}
if err = d.Set("mysql_query_cache_limit", props.Parameters["mysql_query_cache_limit"]); err != nil {
return fmt.Errorf("%s error setting mysql_query_cache_limit: %v", errorPrefix, err)
}
if err = d.Set("mysql_max_allowed_packet", props.Parameters["mysql_max_allowed_packet"]); err != nil {
return fmt.Errorf("%s error setting mysql_max_allowed_packet: %v", errorPrefix, err)
}
Expand Down Expand Up @@ -416,15 +398,9 @@ func resourceGridscaleMySQLCreate(d *schema.ResourceData, meta interface{}) erro
}

params := make(map[string]interface{})
params["mysql_log_bin"] = d.Get("mysql_log_bin")
params["mysql_sql_mode"] = d.Get("mysql_sql_mode")
params["mysql_server_id"] = d.Get("mysql_server_id")
params["mysql_query_cache"] = d.Get("mysql_query_cache")
params["mysql_binlog_format"] = d.Get("mysql_binlog_format")
params["mysql_max_connections"] = d.Get("mysql_max_connections")
params["mysql_query_cache_size"] = d.Get("mysql_query_cache_size")
params["mysql_default_time_zone"] = d.Get("mysql_default_time_zone")
params["mysql_query_cache_limit"] = d.Get("mysql_query_cache_limit")
params["mysql_max_allowed_packet"] = d.Get("mysql_max_allowed_packet")
requestBody.Parameters = params

Expand Down Expand Up @@ -474,15 +450,9 @@ func resourceGridscaleMySQLUpdate(d *schema.ResourceData, meta interface{}) erro
}

params := make(map[string]interface{})
params["mysql_log_bin"] = d.Get("mysql_log_bin")
params["mysql_sql_mode"] = d.Get("mysql_sql_mode")
params["mysql_server_id"] = d.Get("mysql_server_id")
params["mysql_query_cache"] = d.Get("mysql_query_cache")
params["mysql_binlog_format"] = d.Get("mysql_binlog_format")
params["mysql_max_connections"] = d.Get("mysql_max_connections")
params["mysql_query_cache_size"] = d.Get("mysql_query_cache_size")
params["mysql_default_time_zone"] = d.Get("mysql_default_time_zone")
params["mysql_query_cache_limit"] = d.Get("mysql_query_cache_limit")
params["mysql_max_allowed_packet"] = d.Get("mysql_max_allowed_packet")
requestBody.Parameters = params

Expand Down Expand Up @@ -546,45 +516,13 @@ func validateMySQLParameters(d *schema.ResourceDiff, template gsclient.PaaSTempl
}
}
}
if serverID, ok := d.GetOk("mysql_server_id"); ok {
if scheme, ok := template.Properties.ParametersSchema["mysql_server_id"]; ok {
if scheme.Min > serverID.(int) || serverID.(int) > scheme.Max {
errorMessages = append(errorMessages, fmt.Sprintf("Invalid 'mysql_server_id' value. Value must stays between %d and %d\n", scheme.Min, scheme.Max))
}
}
}
if binLogFormat, ok := d.GetOk("mysql_binlog_format"); ok {
if scheme, ok := template.Properties.ParametersSchema["mysql_binlog_format"]; ok {
var isValidFormat bool
for _, allowedValue := range scheme.Allowed {
if binLogFormat.(string) == allowedValue {
isValidFormat = true
}
}
if !isValidFormat {
errorMessages = append(errorMessages,
fmt.Sprintf("Invalid 'mysql_binlog_format' value. Value must be one of these:\n\t%s\n",
strings.Join(scheme.Allowed, "\n\t"),
),
)
}
}
}
if maxNConn, ok := d.GetOk("mysql_max_connections"); ok {
if scheme, ok := template.Properties.ParametersSchema["mysql_max_connections"]; ok {
if scheme.Min > maxNConn.(int) || maxNConn.(int) > scheme.Max {
errorMessages = append(errorMessages, fmt.Sprintf("Invalid 'mysql_max_connections' value. Value must stays between %d and %d\n", scheme.Min, scheme.Max))
}
}
}
if cacheSize, ok := d.GetOk("mysql_query_cache_size"); ok {
if scheme, ok := template.Properties.ParametersSchema["mysql_query_cache_size"]; ok {
validMode := regexp.MustCompile(scheme.Regex)
if !validMode.MatchString(cacheSize.(string)) {
errorMessages = append(errorMessages, fmt.Sprintf("Invalid 'mysql_query_cache_size' value. Example value: '%s'\n", scheme.Default))
}
}
}
if defaultTimeZone, ok := d.GetOk("mysql_default_time_zone"); ok {
if scheme, ok := template.Properties.ParametersSchema["mysql_default_time_zone"]; ok {
var isValidFormat bool
Expand All @@ -602,14 +540,6 @@ func validateMySQLParameters(d *schema.ResourceDiff, template gsclient.PaaSTempl
}
}
}
if cacheLimit, ok := d.GetOk("mysql_query_cache_limit"); ok {
if scheme, ok := template.Properties.ParametersSchema["mysql_query_cache_limit"]; ok {
validMode := regexp.MustCompile(scheme.Regex)
if !validMode.MatchString(cacheLimit.(string)) {
errorMessages = append(errorMessages, fmt.Sprintf("Invalid 'mysql_query_cache_limit' value. Example value: '%s'\n", scheme.Default))
}
}
}
if maxAllowedPacket, ok := d.GetOk("mysql_max_allowed_packet"); ok {
if scheme, ok := template.Properties.ParametersSchema["mysql_max_allowed_packet"]; ok {
validMode := regexp.MustCompile(scheme.Regex)
Expand Down

0 comments on commit 0a7febf

Please sign in to comment.