Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

app_service / web - deprecate Visual Studio versions for remote_debugging_version #28770

Merged
merged 3 commits into from
Feb 13, 2025
+160 −42
Merged

app_service / web - deprecate Visual Studio versions for remote_debugging_version #28770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d75478
deprecate VS versions
sreallymatt Feb 13, 2025
e955e35
update 5.0 upgrade guide
sreallymatt Feb 13, 2025
fc13138
fix minor inconsistency in description
sreallymatt Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions internal/services/appservice/helpers/function_app_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/resource-manager/web/2023-12-01/webapps"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
apimValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down Expand Up @@ -64,7 +65,7 @@ type SiteConfigLinuxFunctionApp struct {
}

func SiteConfigSchemaLinuxFunctionApp() *pluginsdk.Schema {
return &pluginsdk.Schema{
s := &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Required: true,
MaxItems: 1,
Expand Down Expand Up @@ -233,11 +234,9 @@ func SiteConfigSchemaLinuxFunctionApp() *pluginsdk.Schema {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false),
Description: "The Remote Debugging Version. Possible values include `VS2017`, `VS2019`, and `VS2022``",
Description: "The Remote Debugging Version. Currently only `VS2022` is supported.",
},

"runtime_scale_monitoring_enabled": {
Expand Down Expand Up @@ -336,6 +335,16 @@ func SiteConfigSchemaLinuxFunctionApp() *pluginsdk.Schema {
},
},
}

if !features.FivePointOh() {
s.Elem.(*pluginsdk.Resource).Schema["remote_debugging_version"].ValidateFunc = validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false)
}

return s
}

func SiteConfigSchemaLinuxFunctionAppComputed() *pluginsdk.Schema {
Expand Down Expand Up @@ -568,7 +577,7 @@ type SiteConfigWindowsFunctionApp struct {
}

func SiteConfigSchemaWindowsFunctionApp() *pluginsdk.Schema {
return &pluginsdk.Schema{
s := &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Required: true,
MaxItems: 1,
Expand Down Expand Up @@ -720,11 +729,9 @@ func SiteConfigSchemaWindowsFunctionApp() *pluginsdk.Schema {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false),
Description: "The Remote Debugging Version. Possible values include `VS2017`, `VS2019`, and `VS2022`",
Description: "The Remote Debugging Version. Currently only `VS2022` is supported.",
},

"runtime_scale_monitoring_enabled": {
Expand Down Expand Up @@ -823,6 +830,16 @@ func SiteConfigSchemaWindowsFunctionApp() *pluginsdk.Schema {
},
},
}

if !features.FivePointOh() {
s.Elem.(*pluginsdk.Resource).Schema["remote_debugging_version"].ValidateFunc = validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false)
}

return s
}

func SiteConfigSchemaWindowsFunctionAppComputed() *pluginsdk.Schema {
Expand Down
33 changes: 25 additions & 8 deletions internal/services/appservice/helpers/function_app_slot_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/resource-manager/web/2023-12-01/webapps"
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
apimValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down Expand Up @@ -57,7 +58,7 @@ type SiteConfigWindowsFunctionAppSlot struct {
}

func SiteConfigSchemaWindowsFunctionAppSlot() *pluginsdk.Schema {
return &pluginsdk.Schema{
s := &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Required: true,
MaxItems: 1,
Expand Down Expand Up @@ -218,11 +219,9 @@ func SiteConfigSchemaWindowsFunctionAppSlot() *pluginsdk.Schema {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false),
Description: "The Remote Debugging Version. Possible values include `VS2017`, `VS2019`, and `VS2022`",
Description: "The Remote Debugging Version. Currently only `VS2022` is supported.",
},

"runtime_scale_monitoring_enabled": {
Expand Down Expand Up @@ -324,6 +323,16 @@ func SiteConfigSchemaWindowsFunctionAppSlot() *pluginsdk.Schema {
},
},
}

if !features.FivePointOh() {
s.Elem.(*pluginsdk.Resource).Schema["remote_debugging_version"].ValidateFunc = validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false)
}

return s
}

type SiteConfigLinuxFunctionAppSlot struct {
Expand Down Expand Up @@ -369,7 +378,7 @@ type SiteConfigLinuxFunctionAppSlot struct {
}

func SiteConfigSchemaLinuxFunctionAppSlot() *pluginsdk.Schema {
return &pluginsdk.Schema{
s := &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Required: true,
MaxItems: 1,
Expand Down Expand Up @@ -544,11 +553,9 @@ func SiteConfigSchemaLinuxFunctionAppSlot() *pluginsdk.Schema {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false),
Description: "The Remote Debugging Version. Possible values include `VS2017`, `VS2019`, and `VS2022`",
Description: "The Remote Debugging Version. Currently only `VS2022` is supported.",
},

"runtime_scale_monitoring_enabled": {
Expand Down Expand Up @@ -650,6 +657,16 @@ func SiteConfigSchemaLinuxFunctionAppSlot() *pluginsdk.Schema {
},
},
}

if !features.FivePointOh() {
s.Elem.(*pluginsdk.Resource).Schema["remote_debugging_version"].ValidateFunc = validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false)
}

return s
}

func ExpandSiteConfigWindowsFunctionAppSlot(siteConfig []SiteConfigWindowsFunctionAppSlot, existing *webapps.SiteConfig, metadata sdk.ResourceMetaData, version string, storageString string, storageUsesMSI bool) (*webapps.SiteConfig, error) {
Expand Down
15 changes: 12 additions & 3 deletions internal/services/appservice/helpers/linux_web_app_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/resource-manager/web/2023-12-01/webapps"
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/validate"
appServiceValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice/validate"
Expand Down Expand Up @@ -55,7 +56,7 @@ type SiteConfigLinux struct {
}

func SiteConfigSchemaLinux() *pluginsdk.Schema {
return &pluginsdk.Schema{
s := &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Required: true,
MaxItems: 1,
Expand Down Expand Up @@ -180,8 +181,6 @@ func SiteConfigSchemaLinux() *pluginsdk.Schema {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false),
},
Expand Down Expand Up @@ -270,6 +269,16 @@ func SiteConfigSchemaLinux() *pluginsdk.Schema {
},
},
}

if !features.FivePointOh() {
s.Elem.(*pluginsdk.Resource).Schema["remote_debugging_version"].ValidateFunc = validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false)
}

return s
}

func SiteConfigSchemaLinuxComputed() *pluginsdk.Schema {
Expand Down
29 changes: 23 additions & 6 deletions internal/services/appservice/helpers/web_app_slot_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/resource-manager/web/2023-12-01/webapps"
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
apimValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down Expand Up @@ -55,7 +56,7 @@ type SiteConfigLinuxWebAppSlot struct {
}

func SiteConfigSchemaLinuxWebAppSlot() *pluginsdk.Schema {
return &pluginsdk.Schema{
s := &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Required: true,
MaxItems: 1,
Expand Down Expand Up @@ -171,8 +172,6 @@ func SiteConfigSchemaLinuxWebAppSlot() *pluginsdk.Schema {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false),
},
Expand Down Expand Up @@ -263,6 +262,16 @@ func SiteConfigSchemaLinuxWebAppSlot() *pluginsdk.Schema {
},
},
}

if !features.FivePointOh() {
s.Elem.(*pluginsdk.Resource).Schema["remote_debugging_version"].ValidateFunc = validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false)
}

return s
}

type SiteConfigWindowsWebAppSlot struct {
Expand Down Expand Up @@ -305,7 +314,7 @@ type SiteConfigWindowsWebAppSlot struct {
}

func SiteConfigSchemaWindowsWebAppSlot() *pluginsdk.Schema {
return &pluginsdk.Schema{
s := &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Required: true,
MaxItems: 1,
Expand Down Expand Up @@ -426,8 +435,6 @@ func SiteConfigSchemaWindowsWebAppSlot() *pluginsdk.Schema {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false),
},
Expand Down Expand Up @@ -516,6 +523,16 @@ func SiteConfigSchemaWindowsWebAppSlot() *pluginsdk.Schema {
},
},
}

if !features.FivePointOh() {
s.Elem.(*pluginsdk.Resource).Schema["remote_debugging_version"].ValidateFunc = validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false)
}

return s
}

func (s *SiteConfigLinuxWebAppSlot) ExpandForCreate(appSettings map[string]string) (*webapps.SiteConfig, error) {
Expand Down
15 changes: 12 additions & 3 deletions internal/services/appservice/helpers/windows_web_app_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/resource-manager/web/2023-12-01/webapps"
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/parse"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/validate"
Expand Down Expand Up @@ -59,7 +60,7 @@ type SiteConfigWindows struct {
}

func SiteConfigSchemaWindows() *pluginsdk.Schema {
return &pluginsdk.Schema{
s := &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Required: true,
MaxItems: 1,
Expand Down Expand Up @@ -184,8 +185,6 @@ func SiteConfigSchemaWindows() *pluginsdk.Schema {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false),
},
Expand Down Expand Up @@ -283,6 +282,16 @@ func SiteConfigSchemaWindows() *pluginsdk.Schema {
},
},
}

if !features.FivePointOh() {
s.Elem.(*pluginsdk.Resource).Schema["remote_debugging_version"].ValidateFunc = validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false)
}

return s
}

func SiteConfigSchemaWindowsComputed() *pluginsdk.Schema {
Expand Down
15 changes: 12 additions & 3 deletions internal/services/web/app_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2021-02-01/web" // nolint: staticcheck
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
"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"
Expand Down Expand Up @@ -229,7 +230,7 @@ func schemaAppServiceAuthSettings() *pluginsdk.Schema {
}

func schemaAppServiceSiteConfig() *pluginsdk.Schema {
return &pluginsdk.Schema{
s := &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Optional: true,
Computed: true,
Expand Down Expand Up @@ -352,8 +353,6 @@ func schemaAppServiceSiteConfig() *pluginsdk.Schema {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false),
},
Expand Down Expand Up @@ -463,6 +462,16 @@ func schemaAppServiceSiteConfig() *pluginsdk.Schema {
},
},
}

if !features.FivePointOh() {
s.Elem.(*pluginsdk.Resource).Schema["remote_debugging_version"].ValidateFunc = validation.StringInSlice([]string{
"VS2017",
"VS2019",
"VS2022",
}, false)
}

return s
}

func schemaAppServiceLogsConfig() *pluginsdk.Schema {
Expand Down
Loading
Loading