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

Jump to bottom

App Service - Fix bug in App Service processing of application_stack in updates to site_config in web apps and web app slots #24424

Merged
merged 2 commits into from
Jan 9, 2024
Merged

App Service - Fix bug in App Service processing of application_stack in updates to site_config in web apps and web app slots #24424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7157985
fix bug in app settings processing for application_stack
jackofallops Jan 8, 2024
380b5ba
fix bug in app settings processing for application_stack for slots
jackofallops Jan 8, 2024
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
80 changes: 39 additions & 41 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 @@ -894,59 +894,57 @@ func (s *SiteConfigLinux) ExpandForUpdate(metadata sdk.ResourceMetaData, existin
expanded.AppCommandLine = pointer.To(s.AppCommandLine)
}

if metadata.ResourceData.HasChange("site_config.0.application_stack") {
if len(s.ApplicationStack) == 1 {
linuxAppStack := s.ApplicationStack[0]
if linuxAppStack.NetFrameworkVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("DOTNETCORE|%s", linuxAppStack.NetFrameworkVersion))
}
if len(s.ApplicationStack) == 1 {
linuxAppStack := s.ApplicationStack[0]
if linuxAppStack.NetFrameworkVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("DOTNETCORE|%s", linuxAppStack.NetFrameworkVersion))
}

if linuxAppStack.GoVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("GO|%s", linuxAppStack.GoVersion))
}
if linuxAppStack.GoVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("GO|%s", linuxAppStack.GoVersion))
}

if linuxAppStack.PhpVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("PHP|%s", linuxAppStack.PhpVersion))
}
if linuxAppStack.PhpVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("PHP|%s", linuxAppStack.PhpVersion))
}

if linuxAppStack.NodeVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("NODE|%s", linuxAppStack.NodeVersion))
}
if linuxAppStack.NodeVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("NODE|%s", linuxAppStack.NodeVersion))
}

if linuxAppStack.RubyVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("RUBY|%s", linuxAppStack.RubyVersion))
}
if linuxAppStack.RubyVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("RUBY|%s", linuxAppStack.RubyVersion))
}

if linuxAppStack.PythonVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("PYTHON|%s", linuxAppStack.PythonVersion))
}
if linuxAppStack.PythonVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("PYTHON|%s", linuxAppStack.PythonVersion))
}

if linuxAppStack.JavaServer != "" {
javaString, err := JavaLinuxFxStringBuilder(linuxAppStack.JavaVersion, linuxAppStack.JavaServer, linuxAppStack.JavaServerVersion)
if err != nil {
return nil, fmt.Errorf("could not build linuxFxVersion string: %+v", err)
}
expanded.LinuxFxVersion = javaString
if linuxAppStack.JavaServer != "" {
javaString, err := JavaLinuxFxStringBuilder(linuxAppStack.JavaVersion, linuxAppStack.JavaServer, linuxAppStack.JavaServerVersion)
if err != nil {
return nil, fmt.Errorf("could not build linuxFxVersion string: %+v", err)
}
expanded.LinuxFxVersion = javaString
}

if !features.FourPointOhBeta() {
if linuxAppStack.DockerImage != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("DOCKER|%s:%s", linuxAppStack.DockerImage, linuxAppStack.DockerImageTag))
}
if !features.FourPointOhBeta() {
if linuxAppStack.DockerImage != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("DOCKER|%s:%s", linuxAppStack.DockerImage, linuxAppStack.DockerImageTag))
}
}

if linuxAppStack.DockerImageName != "" {
expanded.LinuxFxVersion = pointer.To(EncodeDockerFxString(linuxAppStack.DockerImageName, linuxAppStack.DockerRegistryUrl))
if appSettings == nil {
appSettings = map[string]string{}
}
appSettings["DOCKER_REGISTRY_SERVER_URL"] = linuxAppStack.DockerRegistryUrl
appSettings["DOCKER_REGISTRY_SERVER_USERNAME"] = linuxAppStack.DockerRegistryUsername
appSettings["DOCKER_REGISTRY_SERVER_PASSWORD"] = linuxAppStack.DockerRegistryPassword
if linuxAppStack.DockerImageName != "" {
expanded.LinuxFxVersion = pointer.To(EncodeDockerFxString(linuxAppStack.DockerImageName, linuxAppStack.DockerRegistryUrl))
if appSettings == nil {
appSettings = map[string]string{}
}
} else {
expanded.LinuxFxVersion = pointer.To("")
appSettings["DOCKER_REGISTRY_SERVER_URL"] = linuxAppStack.DockerRegistryUrl
appSettings["DOCKER_REGISTRY_SERVER_USERNAME"] = linuxAppStack.DockerRegistryUsername
appSettings["DOCKER_REGISTRY_SERVER_PASSWORD"] = linuxAppStack.DockerRegistryPassword
}
} else {
expanded.LinuxFxVersion = pointer.To("")
}

expanded.AppSettings = ExpandAppSettingsForCreate(appSettings)
Expand Down
187 changes: 92 additions & 95 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 @@ -710,62 +710,61 @@ func (s *SiteConfigLinuxWebAppSlot) ExpandForUpdate(metadata sdk.ResourceMetaDat
expanded.AppCommandLine = pointer.To(s.AppCommandLine)
}

if metadata.ResourceData.HasChange("site_config.0.application_stack") {
if len(s.ApplicationStack) == 1 {
linuxAppStack := s.ApplicationStack[0]
if linuxAppStack.NetFrameworkVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("DOTNETCORE|%s", linuxAppStack.NetFrameworkVersion))
}
if len(s.ApplicationStack) == 1 {
linuxAppStack := s.ApplicationStack[0]
if linuxAppStack.NetFrameworkVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("DOTNETCORE|%s", linuxAppStack.NetFrameworkVersion))
}

if linuxAppStack.GoVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("GO|%s", linuxAppStack.GoVersion))
}
if linuxAppStack.GoVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("GO|%s", linuxAppStack.GoVersion))
}

if linuxAppStack.PhpVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("PHP|%s", linuxAppStack.PhpVersion))
}
if linuxAppStack.PhpVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("PHP|%s", linuxAppStack.PhpVersion))
}

if linuxAppStack.NodeVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("NODE|%s", linuxAppStack.NodeVersion))
}
if linuxAppStack.NodeVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("NODE|%s", linuxAppStack.NodeVersion))
}

if linuxAppStack.RubyVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("RUBY|%s", linuxAppStack.RubyVersion))
}
if linuxAppStack.RubyVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("RUBY|%s", linuxAppStack.RubyVersion))
}

if linuxAppStack.PythonVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("PYTHON|%s", linuxAppStack.PythonVersion))
}
if linuxAppStack.PythonVersion != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("PYTHON|%s", linuxAppStack.PythonVersion))
}

if linuxAppStack.JavaServer != "" {
javaString, err := JavaLinuxFxStringBuilder(linuxAppStack.JavaVersion, linuxAppStack.JavaServer, linuxAppStack.JavaServerVersion)
if err != nil {
return nil, fmt.Errorf("could not build linuxFxVersion string: %+v", err)
}
expanded.LinuxFxVersion = javaString
if linuxAppStack.JavaServer != "" {
javaString, err := JavaLinuxFxStringBuilder(linuxAppStack.JavaVersion, linuxAppStack.JavaServer, linuxAppStack.JavaServerVersion)
if err != nil {
return nil, fmt.Errorf("could not build linuxFxVersion string: %+v", err)
}
expanded.LinuxFxVersion = javaString
}

if !features.FourPointOhBeta() {
if linuxAppStack.DockerImage != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("DOCKER|%s:%s", linuxAppStack.DockerImage, linuxAppStack.DockerImageTag))
}
if !features.FourPointOhBeta() {
if linuxAppStack.DockerImage != "" {
expanded.LinuxFxVersion = pointer.To(fmt.Sprintf("DOCKER|%s:%s", linuxAppStack.DockerImage, linuxAppStack.DockerImageTag))
}
}

if linuxAppStack.DockerImageName != "" {
expanded.LinuxFxVersion = pointer.To(EncodeDockerFxString(linuxAppStack.DockerImageName, linuxAppStack.DockerRegistryUrl))

if appSettings == nil {
appSettings = make(map[string]string)
}
if linuxAppStack.DockerImageName != "" {
expanded.LinuxFxVersion = pointer.To(EncodeDockerFxString(linuxAppStack.DockerImageName, linuxAppStack.DockerRegistryUrl))

appSettings["DOCKER_REGISTRY_SERVER_URL"] = linuxAppStack.DockerRegistryUrl
appSettings["DOCKER_REGISTRY_SERVER_USERNAME"] = linuxAppStack.DockerRegistryUsername
appSettings["DOCKER_REGISTRY_SERVER_PASSWORD"] = linuxAppStack.DockerRegistryPassword
if appSettings == nil {
appSettings = make(map[string]string)
}
} else {
expanded.LinuxFxVersion = pointer.To("")

appSettings["DOCKER_REGISTRY_SERVER_URL"] = linuxAppStack.DockerRegistryUrl
appSettings["DOCKER_REGISTRY_SERVER_USERNAME"] = linuxAppStack.DockerRegistryUsername
appSettings["DOCKER_REGISTRY_SERVER_PASSWORD"] = linuxAppStack.DockerRegistryPassword
}
} else {
expanded.LinuxFxVersion = pointer.To("")
}

expanded.AppSettings = ExpandAppSettingsForCreate(appSettings)

if metadata.ResourceData.HasChange("site_config.0.auto_swap_slot_name") {
Expand Down Expand Up @@ -1141,70 +1140,68 @@ func (s *SiteConfigWindowsWebAppSlot) ExpandForUpdate(metadata sdk.ResourceMetaD
expanded.AppCommandLine = pointer.To(s.AppCommandLine)
}

if metadata.ResourceData.HasChange("site_config.0.application_stack") {
if len(s.ApplicationStack) == 1 {
winAppStack := s.ApplicationStack[0]
if metadata.ResourceData.HasChange("site_config.0.application_stack.0.node_version") {
if appSettings == nil {
appSettings = make(map[string]string)
}
appSettings["WEBSITE_NODE_DEFAULT_VERSION"] = winAppStack.NodeVersion
if len(s.ApplicationStack) == 1 {
winAppStack := s.ApplicationStack[0]
if metadata.ResourceData.HasChange("site_config.0.application_stack.0.node_version") {
if appSettings == nil {
appSettings = make(map[string]string)
}
if winAppStack.NetFrameworkVersion != "" {
expanded.NetFrameworkVersion = pointer.To(winAppStack.NetFrameworkVersion)
appSettings["WEBSITE_NODE_DEFAULT_VERSION"] = winAppStack.NodeVersion
}
if winAppStack.NetFrameworkVersion != "" {
expanded.NetFrameworkVersion = pointer.To(winAppStack.NetFrameworkVersion)
}
if winAppStack.NetCoreVersion != "" {
expanded.NetFrameworkVersion = pointer.To(winAppStack.NetCoreVersion)
}
if winAppStack.PhpVersion != "" {
if winAppStack.PhpVersion != PhpVersionOff {
expanded.PhpVersion = pointer.To(winAppStack.PhpVersion)
} else {
expanded.PhpVersion = pointer.To("")
}
if winAppStack.NetCoreVersion != "" {
expanded.NetFrameworkVersion = pointer.To(winAppStack.NetCoreVersion)
}
if winAppStack.PythonVersion != "" || winAppStack.Python {
expanded.PythonVersion = pointer.To(winAppStack.PythonVersion)
}
if winAppStack.JavaVersion != "" {
expanded.JavaVersion = pointer.To(winAppStack.JavaVersion)
switch {
case winAppStack.JavaEmbeddedServer:
expanded.JavaContainer = pointer.To(JavaContainerEmbeddedServer)
expanded.JavaContainerVersion = pointer.To(JavaContainerEmbeddedServerVersion)
case winAppStack.TomcatVersion != "":
expanded.JavaContainer = pointer.To(JavaContainerTomcat)
expanded.JavaContainerVersion = pointer.To(winAppStack.TomcatVersion)
case winAppStack.JavaContainer != "":
expanded.JavaContainer = pointer.To(winAppStack.JavaContainer)
expanded.JavaContainerVersion = pointer.To(winAppStack.JavaContainerVersion)
}
if winAppStack.PhpVersion != "" {
if winAppStack.PhpVersion != PhpVersionOff {
expanded.PhpVersion = pointer.To(winAppStack.PhpVersion)
}
if !features.FourPointOhBeta() {
if winAppStack.DockerContainerName != "" || winAppStack.DockerContainerRegistry != "" || winAppStack.DockerContainerTag != "" {
if winAppStack.DockerContainerRegistry != "" {
expanded.WindowsFxVersion = pointer.To(fmt.Sprintf("DOCKER|%s/%s:%s", winAppStack.DockerContainerRegistry, winAppStack.DockerContainerName, winAppStack.DockerContainerTag))
} else {
expanded.PhpVersion = pointer.To("")
}
}
if winAppStack.PythonVersion != "" || winAppStack.Python {
expanded.PythonVersion = pointer.To(winAppStack.PythonVersion)
}
if winAppStack.JavaVersion != "" {
expanded.JavaVersion = pointer.To(winAppStack.JavaVersion)
switch {
case winAppStack.JavaEmbeddedServer:
expanded.JavaContainer = pointer.To(JavaContainerEmbeddedServer)
expanded.JavaContainerVersion = pointer.To(JavaContainerEmbeddedServerVersion)
case winAppStack.TomcatVersion != "":
expanded.JavaContainer = pointer.To(JavaContainerTomcat)
expanded.JavaContainerVersion = pointer.To(winAppStack.TomcatVersion)
case winAppStack.JavaContainer != "":
expanded.JavaContainer = pointer.To(winAppStack.JavaContainer)
expanded.JavaContainerVersion = pointer.To(winAppStack.JavaContainerVersion)
}
}
if !features.FourPointOhBeta() {
if winAppStack.DockerContainerName != "" || winAppStack.DockerContainerRegistry != "" || winAppStack.DockerContainerTag != "" {
if winAppStack.DockerContainerRegistry != "" {
expanded.WindowsFxVersion = pointer.To(fmt.Sprintf("DOCKER|%s/%s:%s", winAppStack.DockerContainerRegistry, winAppStack.DockerContainerName, winAppStack.DockerContainerTag))
} else {
expanded.WindowsFxVersion = pointer.To(fmt.Sprintf("DOCKER|%s:%s", winAppStack.DockerContainerName, winAppStack.DockerContainerTag))
}
expanded.WindowsFxVersion = pointer.To(fmt.Sprintf("DOCKER|%s:%s", winAppStack.DockerContainerName, winAppStack.DockerContainerTag))
}
}
}

if winAppStack.DockerImageName != "" {
expanded.WindowsFxVersion = pointer.To(EncodeDockerFxStringWindows(winAppStack.DockerImageName, winAppStack.DockerRegistryUrl))

if appSettings == nil {
appSettings = make(map[string]string)
}
if winAppStack.DockerImageName != "" {
expanded.WindowsFxVersion = pointer.To(EncodeDockerFxStringWindows(winAppStack.DockerImageName, winAppStack.DockerRegistryUrl))

appSettings["DOCKER_REGISTRY_SERVER_URL"] = winAppStack.DockerRegistryUrl
appSettings["DOCKER_REGISTRY_SERVER_USERNAME"] = winAppStack.DockerRegistryUsername
appSettings["DOCKER_REGISTRY_SERVER_PASSWORD"] = winAppStack.DockerRegistryPassword
if appSettings == nil {
appSettings = make(map[string]string)
}

} else {
expanded.WindowsFxVersion = pointer.To("")
appSettings["DOCKER_REGISTRY_SERVER_URL"] = winAppStack.DockerRegistryUrl
appSettings["DOCKER_REGISTRY_SERVER_USERNAME"] = winAppStack.DockerRegistryUsername
appSettings["DOCKER_REGISTRY_SERVER_PASSWORD"] = winAppStack.DockerRegistryPassword
}

} else {
expanded.WindowsFxVersion = pointer.To("")
}

expanded.AppSettings = ExpandAppSettingsForCreate(appSettings)
Expand Down
Loading
Loading