Skip to content

Commit 22abce8

Browse files
sreallymattsreallymatt
committed
Clean up fields with 'removedInNextMajorVersion' leftover from 4.0
1 parent ba0145d commit 22abce8

23 files changed

+68
-511
lines changed

‎internal/services/appservice/helpers/app_stack.go

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,17 @@ const (
2929
)
3030

3131
type ApplicationStackWindows struct {
32-
CurrentStack string `tfschema:"current_stack"`
33-
DockerContainerName string `tfschema:"docker_container_name,removedInNextMajorVersion"`
34-
DockerContainerRegistry string `tfschema:"docker_container_registry,removedInNextMajorVersion"`
35-
DockerContainerTag string `tfschema:"docker_container_tag,removedInNextMajorVersion"`
36-
JavaContainer string `tfschema:"java_container"`
37-
JavaContainerVersion string `tfschema:"java_container_version"`
38-
JavaEmbeddedServer bool `tfschema:"java_embedded_server_enabled"`
39-
JavaVersion string `tfschema:"java_version"`
40-
NetFrameworkVersion string `tfschema:"dotnet_version"`
41-
NetCoreVersion string `tfschema:"dotnet_core_version"`
42-
NodeVersion string `tfschema:"node_version"`
43-
PhpVersion string `tfschema:"php_version"`
44-
PythonVersion string `tfschema:"python_version,removedInNextMajorVersion"`
45-
Python bool `tfschema:"python"`
46-
TomcatVersion string `tfschema:"tomcat_version"`
32+
CurrentStack string `tfschema:"current_stack"`
33+
JavaContainer string `tfschema:"java_container"`
34+
JavaContainerVersion string `tfschema:"java_container_version"`
35+
JavaEmbeddedServer bool `tfschema:"java_embedded_server_enabled"`
36+
JavaVersion string `tfschema:"java_version"`
37+
NetFrameworkVersion string `tfschema:"dotnet_version"`
38+
NetCoreVersion string `tfschema:"dotnet_core_version"`
39+
NodeVersion string `tfschema:"node_version"`
40+
PhpVersion string `tfschema:"php_version"`
41+
Python bool `tfschema:"python"`
42+
TomcatVersion string `tfschema:"tomcat_version"`
4743

4844
DockerRegistryUrl string `tfschema:"docker_registry_url"`
4945
DockerRegistryUsername string `tfschema:"docker_registry_username"`
@@ -329,8 +325,6 @@ type ApplicationStackLinux struct {
329325
JavaVersion string `tfschema:"java_version"`
330326
JavaServer string `tfschema:"java_server"`
331327
JavaServerVersion string `tfschema:"java_server_version"`
332-
DockerImageTag string `tfschema:"docker_image_tag,removedInNextMajorVersion"`
333-
DockerImage string `tfschema:"docker_image,removedInNextMajorVersion"`
334328
RubyVersion string `tfschema:"ruby_version"`
335329

336330
DockerRegistryUrl string `tfschema:"docker_registry_url"`

‎internal/services/appservice/helpers/auto_heal.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ type AutoHealSlowRequest struct {
4545
TimeTaken string `tfschema:"time_taken"`
4646
Interval string `tfschema:"interval"`
4747
Count int64 `tfschema:"count"`
48-
Path string `tfschema:"path,removedInNextMajorVersion"`
4948
}
5049

5150
type AutoHealSlowRequestWithPath struct {
@@ -615,7 +614,6 @@ func flattenAutoHealSettingsWindows(autoHealRules *webapps.AutoHealRules) []Auto
615614
TimeTaken: pointer.From(triggers.SlowRequests.TimeTaken),
616615
Interval: pointer.From(triggers.SlowRequests.TimeInterval),
617616
Count: pointer.From(triggers.SlowRequests.Count),
618-
Path: pointer.From(triggers.SlowRequests.Path),
619617
})
620618
}
621619

‎internal/services/appservice/helpers/linux_web_app_schema.go

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,38 +1159,6 @@ func (s *SiteConfigLinux) DecodeDockerAppStack(input map[string]string) {
11591159
s.ApplicationStack = []ApplicationStackLinux{applicationStack}
11601160
}
11611161

1162-
func (s *SiteConfigLinux) DecodeDockerDeprecatedAppStack(input map[string]string, usesDeprecated bool) {
1163-
applicationStack := ApplicationStackLinux{}
1164-
if len(s.ApplicationStack) == 1 {
1165-
applicationStack = s.ApplicationStack[0]
1166-
}
1167-
if !usesDeprecated {
1168-
if v, ok := input["DOCKER_REGISTRY_SERVER_URL"]; ok {
1169-
applicationStack.DockerRegistryUrl = v
1170-
}
1171-
1172-
if v, ok := input["DOCKER_REGISTRY_SERVER_USERNAME"]; ok {
1173-
applicationStack.DockerRegistryUsername = v
1174-
}
1175-
1176-
if v, ok := input["DOCKER_REGISTRY_SERVER_PASSWORD"]; ok {
1177-
applicationStack.DockerRegistryPassword = v
1178-
}
1179-
1180-
registryHost := trimURLScheme(applicationStack.DockerRegistryUrl)
1181-
dockerString := strings.TrimPrefix(s.LinuxFxVersion, "DOCKER|")
1182-
applicationStack.DockerImageName = strings.TrimPrefix(dockerString, registryHost+"/")
1183-
} else {
1184-
parts := strings.Split(s.LinuxFxVersion, "|")
1185-
if dockerParts := strings.Split(parts[1], ":"); len(dockerParts) == 2 {
1186-
applicationStack.DockerImage = dockerParts[0]
1187-
applicationStack.DockerImageTag = dockerParts[1]
1188-
}
1189-
}
1190-
1191-
s.ApplicationStack = []ApplicationStackLinux{applicationStack}
1192-
}
1193-
11941162
func expandAutoHealSettingsLinux(autoHealSettings []AutoHealSettingLinux) *webapps.AutoHealRules {
11951163
if len(autoHealSettings) == 0 {
11961164
return nil
@@ -1227,9 +1195,6 @@ func expandAutoHealSettingsLinux(autoHealSettings []AutoHealSettingLinux) *webap
12271195
TimeInterval: pointer.To(triggers.SlowRequests[0].Interval),
12281196
Count: pointer.To(triggers.SlowRequests[0].Count),
12291197
}
1230-
if triggers.SlowRequests[0].Path != "" {
1231-
result.Triggers.SlowRequests.Path = pointer.To(triggers.SlowRequests[0].Path)
1232-
}
12331198
}
12341199

12351200
if len(triggers.SlowRequestsWithPath) > 0 {
@@ -1359,7 +1324,6 @@ func flattenAutoHealSettingsLinux(autoHealRules *webapps.AutoHealRules) []AutoHe
13591324
TimeTaken: pointer.From(triggers.SlowRequests.TimeTaken),
13601325
Interval: pointer.From(triggers.SlowRequests.TimeInterval),
13611326
Count: pointer.From(triggers.SlowRequests.Count),
1362-
Path: pointer.From(triggers.SlowRequests.Path),
13631327
})
13641328
}
13651329

‎internal/services/appservice/helpers/web_app_slot_schema.go

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -910,38 +910,6 @@ func (s *SiteConfigLinuxWebAppSlot) DecodeDockerAppStack(input map[string]string
910910
s.ApplicationStack = []ApplicationStackLinux{applicationStack}
911911
}
912912

913-
func (s *SiteConfigLinuxWebAppSlot) DecodeDockerDeprecatedAppStack(input map[string]string, usesDeprecated bool) {
914-
applicationStack := ApplicationStackLinux{}
915-
if len(s.ApplicationStack) == 1 {
916-
applicationStack = s.ApplicationStack[0]
917-
}
918-
if !usesDeprecated {
919-
if v, ok := input["DOCKER_REGISTRY_SERVER_URL"]; ok {
920-
applicationStack.DockerRegistryUrl = v
921-
}
922-
923-
if v, ok := input["DOCKER_REGISTRY_SERVER_USERNAME"]; ok {
924-
applicationStack.DockerRegistryUsername = v
925-
}
926-
927-
if v, ok := input["DOCKER_REGISTRY_SERVER_PASSWORD"]; ok {
928-
applicationStack.DockerRegistryPassword = v
929-
}
930-
931-
registryHost := trimURLScheme(applicationStack.DockerRegistryUrl)
932-
dockerString := strings.TrimPrefix(s.LinuxFxVersion, "DOCKER|")
933-
applicationStack.DockerImageName = strings.TrimPrefix(dockerString, registryHost+"/")
934-
} else {
935-
parts := strings.Split(s.LinuxFxVersion, "|")
936-
if dockerParts := strings.Split(parts[1], ":"); len(dockerParts) == 2 {
937-
applicationStack.DockerImage = dockerParts[0]
938-
applicationStack.DockerImageTag = dockerParts[1]
939-
}
940-
}
941-
942-
s.ApplicationStack = []ApplicationStackLinux{applicationStack}
943-
}
944-
945913
func (s *SiteConfigWindowsWebAppSlot) ExpandForCreate(appSettings map[string]string) (*webapps.SiteConfig, error) {
946914
expanded := &webapps.SiteConfig{}
947915

@@ -1002,9 +970,6 @@ func (s *SiteConfigWindowsWebAppSlot) ExpandForCreate(appSettings map[string]str
1002970
expanded.PhpVersion = pointer.To("")
1003971
}
1004972
}
1005-
if winAppStack.PythonVersion != "" || winAppStack.Python {
1006-
expanded.PythonVersion = pointer.To(winAppStack.PythonVersion)
1007-
}
1008973
if winAppStack.JavaVersion != "" {
1009974
expanded.JavaVersion = pointer.To(winAppStack.JavaVersion)
1010975
switch {
@@ -1141,9 +1106,6 @@ func (s *SiteConfigWindowsWebAppSlot) ExpandForUpdate(metadata sdk.ResourceMetaD
11411106
expanded.PhpVersion = pointer.To("")
11421107
}
11431108
}
1144-
if winAppStack.PythonVersion != "" || winAppStack.Python {
1145-
expanded.PythonVersion = pointer.To(winAppStack.PythonVersion)
1146-
}
11471109
if winAppStack.JavaVersion != "" {
11481110
expanded.JavaVersion = pointer.To(winAppStack.JavaVersion)
11491111
switch {
@@ -1344,7 +1306,6 @@ func (s *SiteConfigWindowsWebAppSlot) Flatten(appSiteSlotConfig *webapps.SiteCon
13441306
if winAppStack.PhpVersion == "" {
13451307
winAppStack.PhpVersion = PhpVersionOff
13461308
}
1347-
winAppStack.PythonVersion = pointer.From(appSiteSlotConfig.PythonVersion) // This _should_ always be `""`
13481309
winAppStack.Python = currentStack == CurrentStackPython
13491310
winAppStack.JavaVersion = pointer.From(appSiteSlotConfig.JavaVersion)
13501311
switch pointer.From(appSiteSlotConfig.JavaContainer) {
@@ -1404,43 +1365,3 @@ func (s *SiteConfigWindowsWebAppSlot) DecodeDockerAppStack(input map[string]stri
14041365

14051366
s.ApplicationStack = []ApplicationStackWindows{applicationStack}
14061367
}
1407-
1408-
func (s *SiteConfigWindowsWebAppSlot) DecodeDockerDeprecatedAppStack(input map[string]string, usesDeprecated bool) {
1409-
applicationStack := ApplicationStackWindows{}
1410-
if len(s.ApplicationStack) == 1 {
1411-
applicationStack = s.ApplicationStack[0]
1412-
}
1413-
1414-
if !usesDeprecated {
1415-
if v, ok := input["DOCKER_REGISTRY_SERVER_URL"]; ok {
1416-
applicationStack.DockerRegistryUrl = v
1417-
}
1418-
1419-
if v, ok := input["DOCKER_REGISTRY_SERVER_USERNAME"]; ok {
1420-
applicationStack.DockerRegistryUsername = v
1421-
}
1422-
1423-
if v, ok := input["DOCKER_REGISTRY_SERVER_PASSWORD"]; ok {
1424-
applicationStack.DockerRegistryPassword = v
1425-
}
1426-
1427-
registryHost := trimURLScheme(applicationStack.DockerRegistryUrl)
1428-
dockerString := strings.TrimPrefix(s.WindowsFxVersion, "DOCKER|")
1429-
dockerString = strings.TrimPrefix(dockerString, registryHost)
1430-
applicationStack.DockerImageName = strings.TrimPrefix(dockerString, "/")
1431-
} else {
1432-
parts := strings.Split(strings.TrimPrefix(s.WindowsFxVersion, "DOCKER|"), ":")
1433-
if len(parts) == 2 {
1434-
applicationStack.DockerContainerTag = parts[1]
1435-
path := strings.Split(parts[0], "/")
1436-
if len(path) > 1 {
1437-
applicationStack.DockerContainerRegistry = path[0]
1438-
applicationStack.DockerContainerName = strings.TrimPrefix(parts[0], fmt.Sprintf("%s/", path[0]))
1439-
} else {
1440-
applicationStack.DockerContainerName = path[0]
1441-
}
1442-
}
1443-
}
1444-
1445-
s.ApplicationStack = []ApplicationStackWindows{applicationStack}
1446-
}

‎internal/services/appservice/helpers/windows_web_app_schema.go

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -513,9 +513,6 @@ func (s *SiteConfigWindows) ExpandForCreate(appSettings map[string]string) (*web
513513
expanded.PhpVersion = pointer.To("")
514514
}
515515
}
516-
if winAppStack.PythonVersion != "" || winAppStack.Python {
517-
expanded.PythonVersion = pointer.To(winAppStack.PythonVersion)
518-
}
519516
if winAppStack.JavaVersion != "" {
520517
expanded.JavaVersion = pointer.To(winAppStack.JavaVersion)
521518
switch {
@@ -657,9 +654,6 @@ func (s *SiteConfigWindows) ExpandForUpdate(metadata sdk.ResourceMetaData, exist
657654
}
658655
}
659656
}
660-
if winAppStack.PythonVersion != "" || winAppStack.Python {
661-
expanded.PythonVersion = pointer.To(winAppStack.PythonVersion)
662-
}
663657
if metadata.ResourceData.HasChange("site_config.0.application_stack.0.java_version") {
664658
if winAppStack.JavaVersion != "" {
665659
expanded.JavaVersion = pointer.To(winAppStack.JavaVersion)
@@ -859,7 +853,6 @@ func (s *SiteConfigWindows) Flatten(appSiteConfig *webapps.SiteConfig, currentSt
859853
if winAppStack.PhpVersion == "" {
860854
winAppStack.PhpVersion = PhpVersionOff
861855
}
862-
winAppStack.PythonVersion = pointer.From(appSiteConfig.PythonVersion) // This _should_ always be `""`
863856
winAppStack.Python = currentStack == CurrentStackPython
864857

865858
// we should only set JavaVersion when currentStack is java since the API will return the value of JavaVersion that was once set
@@ -917,45 +910,6 @@ func (s *SiteConfigWindows) DecodeDockerAppStack(input map[string]string) {
917910
s.ApplicationStack = []ApplicationStackWindows{applicationStack}
918911
}
919912

920-
func (s *SiteConfigWindows) DecodeDockerDeprecatedAppStack(input map[string]string, usesDeprecated bool) {
921-
applicationStack := ApplicationStackWindows{}
922-
if len(s.ApplicationStack) == 1 {
923-
applicationStack = s.ApplicationStack[0]
924-
}
925-
926-
if !usesDeprecated {
927-
if v, ok := input["DOCKER_REGISTRY_SERVER_URL"]; ok {
928-
applicationStack.DockerRegistryUrl = v
929-
}
930-
931-
if v, ok := input["DOCKER_REGISTRY_SERVER_USERNAME"]; ok {
932-
applicationStack.DockerRegistryUsername = v
933-
}
934-
935-
if v, ok := input["DOCKER_REGISTRY_SERVER_PASSWORD"]; ok {
936-
applicationStack.DockerRegistryPassword = v
937-
}
938-
939-
registryHost := trimURLScheme(applicationStack.DockerRegistryUrl)
940-
dockerString := strings.TrimPrefix(s.WindowsFxVersion, "DOCKER|")
941-
applicationStack.DockerImageName = strings.TrimPrefix(dockerString, registryHost+"/")
942-
} else {
943-
parts := strings.Split(strings.TrimPrefix(s.WindowsFxVersion, "DOCKER|"), ":")
944-
if len(parts) == 2 {
945-
applicationStack.DockerContainerTag = parts[1]
946-
path := strings.Split(parts[0], "/")
947-
if len(path) > 1 {
948-
applicationStack.DockerContainerRegistry = path[0]
949-
applicationStack.DockerContainerName = strings.TrimPrefix(parts[0], fmt.Sprintf("%s/", path[0]))
950-
} else {
951-
applicationStack.DockerContainerName = path[0]
952-
}
953-
}
954-
}
955-
956-
s.ApplicationStack = []ApplicationStackWindows{applicationStack}
957-
}
958-
959913
func (s *SiteConfigWindows) ParseNodeVersion(input map[string]string) map[string]string {
960914
if nodeVer, ok := input["WEBSITE_NODE_DEFAULT_VERSION"]; ok {
961915
if s.ApplicationStack == nil {

‎internal/services/automation/automation_software_update_configuration_resource.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ type Linux struct {
6161
Classifications []string `tfschema:"classifications_included"`
6262
ExcludedPackages []string `tfschema:"excluded_packages"`
6363
IncludedPackages []string `tfschema:"included_packages"`
64-
65-
Classification string `tfschema:"classification_included,removedInNextMajorVersion"`
6664
}
6765

6866
type MonthlyOccurrence struct {
@@ -109,16 +107,13 @@ type Windows struct {
109107
ExcludedKbs []string `tfschema:"excluded_knowledge_base_numbers"`
110108
IncludedKbs []string `tfschema:"included_knowledge_base_numbers"`
111109
RebootSetting string `tfschema:"reboot"`
112-
113-
Classification string `tfschema:"classification_included,removedInNextMajorVersion"`
114110
}
115111

116112
type SoftwareUpdateConfigurationModel struct {
117113
AutomationAccountID string `tfschema:"automation_account_id"`
118114
Name string `tfschema:"name"`
119115
ErrorCode string `tfschema:"error_code"`
120116
ErrorMessage string `tfschema:"error_message"`
121-
OperatingSystem string `tfschema:"operating_system,removedInNextMajorVersion"`
122117
Linux []Linux `tfschema:"linux"`
123118
Windows []Windows `tfschema:"windows"`
124119
Duration string `tfschema:"duration"`
@@ -673,7 +668,6 @@ func (m SoftwareUpdateConfigurationResource) Read() sdk.ResourceFunc {
673668
}
674669

675670
state.Linux = []Linux{l}
676-
state.OperatingSystem = string(softwareupdateconfiguration.OperatingSystemTypeLinux)
677671
}
678672
if windows := updateConfiguration.Windows; windows != nil {
679673
w := Windows{
@@ -684,7 +678,6 @@ func (m SoftwareUpdateConfigurationResource) Read() sdk.ResourceFunc {
684678
}
685679

686680
state.Windows = []Windows{w}
687-
state.OperatingSystem = string(softwareupdateconfiguration.OperatingSystemTypeWindows)
688681
}
689682
if targets := updateConfiguration.Targets; targets != nil {
690683
t := Target{}

‎internal/services/containerapps/container_app_job_resource.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ type ContainerAppJobModel struct {
3838
ReplicaRetryLimit int64 `tfschema:"replica_retry_limit"`
3939
ReplicaTimeoutInSeconds int64 `tfschema:"replica_timeout_in_seconds"`
4040
Secrets []helpers.Secret `tfschema:"secret"`
41-
SecretsDeprecated []helpers.Secret `tfschema:"secrets,removedInNextMajorVersion"`
4241
Registries []helpers.Registry `tfschema:"registry"`
43-
RegistriesDeprecated []helpers.Registry `tfschema:"registries,removedInNextMajorVersion"`
4442
EventTriggerConfig []helpers.EventTriggerConfiguration `tfschema:"event_trigger_config"`
4543
ManualTriggerConfig []helpers.ManualTriggerConfiguration `tfschema:"manual_trigger_config"`
4644
ScheduleTriggerConfig []helpers.ScheduleTriggerConfiguration `tfschema:"schedule_trigger_config"`
@@ -66,7 +64,7 @@ func (r ContainerAppJobResource) IDValidationFunc() pluginsdk.SchemaValidateFunc
6664
}
6765

6866
func (r ContainerAppJobResource) Arguments() map[string]*schema.Schema {
69-
schema := map[string]*pluginsdk.Schema{
67+
return map[string]*pluginsdk.Schema{
7068
"name": {
7169
Type: pluginsdk.TypeString,
7270
Required: true,
@@ -203,8 +201,6 @@ func (r ContainerAppJobResource) Arguments() map[string]*schema.Schema {
203201

204202
"tags": commonschema.Tags(),
205203
}
206-
207-
return schema
208204
}
209205

210206
func (r ContainerAppJobResource) Attributes() map[string]*schema.Schema {

0 commit comments

Comments
 (0)