Skip to content

Commit

Permalink
Migrating Azure SpringCloud to new Kermit endpoint (#28246)
Browse files Browse the repository at this point in the history 
* migrating azure springcloud to new kermit endpoint

* fixing vendor dependencies
  • Loading branch information
@Chambras
Chambras authored Dec 11, 2024
1 parent 624763d commit 26a671a
Show file tree
Hide file tree
Showing 61 changed files with 24 additions and 406 deletions.
1 change: 0 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ require (
github.com/rickb777/date v1.12.5-0.20200422084442-6300e543c4d9
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
github.com/tombuildsstuff/giovanni v0.27.0
github.com/tombuildsstuff/kermit v0.20240122.1123108
golang.org/x/crypto v0.29.0
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
gopkg.in/yaml.v3 v3.0.1
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,6 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/tombuildsstuff/giovanni v0.27.0 h1:3CDNjauK78FIhvvCp0SAHlvNcPTcofR6zQXvxwhk4zY=
github.com/tombuildsstuff/giovanni v0.27.0/go.mod h1:SviBdlwdVn2HyArdRABBqMUODBJ2adQHi+RFEVaO05I=
github.com/tombuildsstuff/kermit v0.20240122.1123108 h1:icQaxsv/ANv/KC4Sr0V1trrWA/XIL+3QAVBDpiSTgj8=
github.com/tombuildsstuff/kermit v0.20240122.1123108/go.mod h1:T3YBVFhRV4qA7SbnRaNE6eapIMpKDA9rG/V7Ocsjlno=
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

appplatform2 "github.com/hashicorp/go-azure-sdk/resource-manager/appplatform/2024-01-01-preview/appplatform"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

type Client struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_accelerator_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

type SpringCloudAcceleratorModel struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_active_deployment_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/services/springcloud/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudActiveDeployment() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_api_portal_custom_domain_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudAPIPortalCustomDomain() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_app_cosmosdb_association_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_app_mysql_association_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_app_redis_association_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

const springCloudAppRedisAssociationKeySSL = "useSsl"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_app_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudApp() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_application_live_view_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

type SpringCloudApplicationLiveViewModel struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_build_deployment_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudBuildDeployment() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_build_pack_binding_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudBuildPackBinding() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_builder_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudBuildServiceBuilder() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_certificate_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudCertificate() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_container_deployment_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudContainerDeployment() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_custom_domain_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudCustomDomain() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_dev_tool_portal_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

type SpringCloudDevToolPortalModel struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_gateway_custom_domain_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudGatewayCustomDomain() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_gateway_route_config_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudGatewayRouteConfig() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_java_deployment_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudJavaDeployment() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_service_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudService() *pluginsdk.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/springcloud/spring_cloud_storage_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
"github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
"github.com/jackofallops/kermit/sdk/appplatform/2023-05-01-preview/appplatform"
)

func resourceSpringCloudStorage() *pluginsdk.Resource {
Expand Down
0 ...iew/appplatform/apiportalcustomdomains.go → ...iew/appplatform/apiportalcustomdomains.go
View file
File renamed without changes.
0 ...3-05-01-preview/appplatform/apiportals.go → ...3-05-01-preview/appplatform/apiportals.go
View file
File renamed without changes.
0 ...rm/2023-05-01-preview/appplatform/apms.go → ...rm/2023-05-01-preview/appplatform/apms.go
View file
File renamed without changes.
0 ...ew/appplatform/applicationaccelerators.go → ...ew/appplatform/applicationaccelerators.go
View file
File renamed without changes.
0 ...eview/appplatform/applicationliveviews.go → ...eview/appplatform/applicationliveviews.go
View file
File renamed without changes.
0 ...rm/2023-05-01-preview/appplatform/apps.go → ...rm/2023-05-01-preview/appplatform/apps.go
View file
File renamed without changes.
0 ...023-05-01-preview/appplatform/bindings.go → ...023-05-01-preview/appplatform/bindings.go
View file
File renamed without changes.
0 ...1-preview/appplatform/buildpackbinding.go → ...1-preview/appplatform/buildpackbinding.go
View file
File renamed without changes.
0 ...05-01-preview/appplatform/buildservice.go → ...05-01-preview/appplatform/buildservice.go
View file
File renamed without changes.
0 ...view/appplatform/buildserviceagentpool.go → ...view/appplatform/buildserviceagentpool.go
View file
File renamed without changes.
0 ...review/appplatform/buildservicebuilder.go → ...review/appplatform/buildservicebuilder.go
View file
File renamed without changes.
0 ...05-01-preview/appplatform/certificates.go → ...05-01-preview/appplatform/certificates.go
View file
File renamed without changes.
0 .../2023-05-01-preview/appplatform/client.go → .../2023-05-01-preview/appplatform/client.go
View file
File renamed without changes.
0 ...5-01-preview/appplatform/configservers.go → ...5-01-preview/appplatform/configservers.go
View file
File renamed without changes.
0 ...view/appplatform/configurationservices.go → ...view/appplatform/configurationservices.go
View file
File renamed without changes.
0 ...review/appplatform/containerregistries.go → ...review/appplatform/containerregistries.go
View file
File renamed without changes.
0 ...5-01-preview/appplatform/customdomains.go → ...5-01-preview/appplatform/customdomains.go
View file
File renamed without changes.
0 ...iew/appplatform/customizedaccelerators.go → ...iew/appplatform/customizedaccelerators.go
View file
File renamed without changes.
0 ...-05-01-preview/appplatform/deployments.go → ...-05-01-preview/appplatform/deployments.go
View file
File renamed without changes.
0 ...-01-preview/appplatform/devtoolportals.go → ...-01-preview/appplatform/devtoolportals.go
View file
File renamed without changes.
0 ...m/2023-05-01-preview/appplatform/enums.go → ...m/2023-05-01-preview/appplatform/enums.go
View file
File renamed without changes.
0 ...5-01-preview/appplatform/eurekaservers.go → ...5-01-preview/appplatform/eurekaservers.go
View file
File renamed without changes.
0 ...eview/appplatform/gatewaycustomdomains.go → ...eview/appplatform/gatewaycustomdomains.go
View file
File renamed without changes.
0 ...review/appplatform/gatewayrouteconfigs.go → ...review/appplatform/gatewayrouteconfigs.go
View file
File renamed without changes.
0 ...023-05-01-preview/appplatform/gateways.go → ...023-05-01-preview/appplatform/gateways.go
View file
File renamed without changes.
0 .../2023-05-01-preview/appplatform/models.go → .../2023-05-01-preview/appplatform/models.go
View file
File renamed without changes.
0 ...preview/appplatform/monitoringsettings.go → ...preview/appplatform/monitoringsettings.go
View file
File renamed without changes.
0 ...3-05-01-preview/appplatform/operations.go → ...3-05-01-preview/appplatform/operations.go
View file
File renamed without changes.
0 ...iew/appplatform/predefinedaccelerators.go → ...iew/appplatform/predefinedaccelerators.go
View file
File renamed without changes.
0 ...01-preview/appplatform/runtimeversions.go → ...01-preview/appplatform/runtimeversions.go
View file
File renamed without changes.
0 ...-preview/appplatform/serviceregistries.go → ...-preview/appplatform/serviceregistries.go
View file
File renamed without changes.
0 ...023-05-01-preview/appplatform/services.go → ...023-05-01-preview/appplatform/services.go
View file
File renamed without changes.
0 ...rm/2023-05-01-preview/appplatform/skus.go → ...rm/2023-05-01-preview/appplatform/skus.go
View file
File renamed without changes.
0 ...023-05-01-preview/appplatform/storages.go → ...023-05-01-preview/appplatform/storages.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...2023-05-01-preview/appplatform/version.go → ...2023-05-01-preview/appplatform/version.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 26a671a

Please sign in to comment.