Upgrade version of MySQL to 2023-12-30

docs/hugo/content/reference/_index.md

@@ -295,6 +295,18 @@ Azure Database for MySQL - Single Server is on the retirement path and is [sched
 
 Existing instances of *Single Server* can be migrated to *Azure Database for MySQL - Flexible Server* using the [Azure Database migration Service](https://azure.microsoft.com/en-us/products/database-migration).
 
+### Next Release
+
+Development of these new resources is complete and they will be available in the next release of ASO.
+
+| Resource                     | ARM Version | CRD Version   | Supported From | Sample                                                                                                                                                |
+|------------------------------|-------------|---------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| FlexibleServer               | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserver.yaml)               |
+| FlexibleServersAdministrator | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserversadministrator.yaml) |
+| FlexibleServersConfiguration | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserversconfiguration.yaml) |
+| FlexibleServersDatabase      | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserversdatabase.yaml)      |
+| FlexibleServersFirewallRule  | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserversfirewallrule.yaml)  |
+
 ### Released
 
 These resource(s) are available for use in the current release of ASO. Different versions of a given resource reflect different versions of the Azure ARM API.

docs/hugo/content/reference/dbformysql/_index.md

@@ -9,6 +9,18 @@ Azure Database for MySQL - Single Server is on the retirement path and is [sched
 
 Existing instances of *Single Server* can be migrated to *Azure Database for MySQL - Flexible Server* using the [Azure Database migration Service](https://azure.microsoft.com/en-us/products/database-migration).
 
+### Next Release
+
+Development of these new resources is complete and they will be available in the next release of ASO.
+
+| Resource                     | ARM Version | CRD Version   | Supported From | Sample                                                                                                                                                |
+|------------------------------|-------------|---------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| FlexibleServer               | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserver.yaml)               |
+| FlexibleServersAdministrator | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserversadministrator.yaml) |
+| FlexibleServersConfiguration | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserversconfiguration.yaml) |
+| FlexibleServersDatabase      | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserversdatabase.yaml)      |
+| FlexibleServersFirewallRule  | 2023-12-30  | v1api20231230 | v2.12.0        | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbformysql/v1api20231230/v1api20231230_flexibleserversfirewallrule.yaml)  |
+
 ### Released
 
 These resource(s) are available for use in the current release of ASO. Different versions of a given resource reflect different versions of the Azure ARM API.

v2/api/dbformysql/customizations/flexible_server_extensions.go

@@ -15,7 +15,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
-	mysql "github.com/Azure/azure-service-operator/v2/api/dbformysql/v1api20230630/storage"
+	mysql "github.com/Azure/azure-service-operator/v2/api/dbformysql/v1api20231230/storage"
 	"github.com/Azure/azure-service-operator/v2/internal/genericarmclient"
 	"github.com/Azure/azure-service-operator/v2/internal/set"
 	"github.com/Azure/azure-service-operator/v2/internal/util/to"

v2/api/dbformysql/customizations/flexible_servers_configuration_extensions.go

@@ -8,7 +8,7 @@ package customizations
 import (
 	"context"
 
-	api "github.com/Azure/azure-service-operator/v2/api/dbformysql/v1api20230630"
+	api "github.com/Azure/azure-service-operator/v2/api/dbformysql/v1api20231230"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime/extensions"
 )

v2/api/dbformysql/v1api20210501/storage/flexible_server_types_overrides.go

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+package storage
+
+import (
+	v20230630s "github.com/Azure/azure-service-operator/v2/api/dbformysql/v1api20230630/storage"
+	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
+)
+
+var _ augmentConversionForFlexibleServer_Spec = &FlexibleServer_Spec{}
+
+// AssignPropertiesFrom implements augmentConversionForFlexibleServer.
+func (server *FlexibleServer_Spec) AssignPropertiesFrom(src *v20230630s.FlexibleServer_Spec) error {
+	// Clone the existing property bag
+	pb := genruntime.NewPropertyBag(server.PropertyBag)
+
+	if src.SourceServerResourceReference != nil {
+		armID := src.SourceServerResourceReference.ARMID
+		server.SourceServerResourceId = &armID
+		pb.Remove("SourceServerResourceReference")
+	}
+
+	// Store updated property bag
+	server.PropertyBag = pb
+
+	return nil
+}
+
+// AssignPropertiesTo implements augmentConversionForFlexibleServer.
+func (server *FlexibleServer_Spec) AssignPropertiesTo(dst *v20230630s.FlexibleServer_Spec) error {
+	// Get the current property bag
+	pb := genruntime.NewPropertyBag(dst.PropertyBag)
+
+	if server.SourceServerResourceId != nil {
+		dst.SourceServerResourceReference = &genruntime.ResourceReference{
+			ARMID: *server.SourceServerResourceId,
+		}
+
+		pb.Remove("SourceServerResourceId")
+	}
+
+	// Store updated property bag
+	dst.PropertyBag = pb
+
+	return nil
+}