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

azurerm_function_app and azurerm_function_app_slot - fix app_settings for WEBSITE_CONTENTSHARE #13349

Merged
merged 7 commits into from
Sep 16, 2021
Merged

azurerm_function_app and azurerm_function_app_slot - fix app_settings for WEBSITE_CONTENTSHARE #13349

merged 7 commits into from
Sep 16, 2021

Conversation

jackofallops
Copy link
Member

@jackofallops jackofallops commented Sep 14, 2021 •
edited
Loading

fixes #10499
fixes #12914
supersedes #10494

@jackofallops jackofallops added the service/functions Function Apps label Sep 14, 2021
@jackofallops jackofallops added this to the v2.77.0 milestone Sep 14, 2021
@jackofallops jackofallops requested a review from a team September 14, 2021 15:21
@jackofallops jackofallops self-assigned this Sep 14, 2021
This was referenced Sep 15, 2021
Closed
Closed
manicminer
manicminer approved these changes Sep 15, 2021
View reviewed changes
Copy link
Contributor

@manicminer manicminer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very minor suggestion but otherwise LGTM 🍎

internal/services/web/function_app.go Outdated
if (strings.EqualFold(appServiceTier, "dynamic") || strings.EqualFold(appServiceTier, "elasticpremium") || strings.HasPrefix(strings.ToLower(appServiceTier), "premium")) &&
!strings.EqualFold(d.Get("os_type").(string), "linux") {
if !(strings.EqualFold(appServiceTier, "dynamic") && strings.EqualFold(d.Get("os_type").(string), "linux")) &&
(strings.EqualFold(appServiceTier, "dynamic") || strings.HasPrefix(appServiceTier, "elastic") || strings.HasPrefix(appServiceTier, "Elastic")) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor but a bit shorter?

Suggested change
(strings.EqualFold(appServiceTier, "dynamic") || strings.HasPrefix(appServiceTier, "elastic") || strings.HasPrefix(appServiceTier, "Elastic")) {
(strings.EqualFold(appServiceTier, "dynamic") || strings.HasPrefix(strings.ToLower(appServiceTier), "elastic")) {

internal/services/web/function_app_resource.go Outdated
// From the docs:
// Only used when deploying to a Premium plan or to a Consumption plan running on Windows. Not supported for Consumptions plans running Linux.
if (strings.EqualFold(appServiceTier, "dynamic") && strings.EqualFold(d.Get("os_type").(string), "linux")) ||
(strings.EqualFold(appServiceTier, "dynamic") || strings.HasPrefix(appServiceTier, "elastic") || strings.HasPrefix(appServiceTier, "Elastic")) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(strings.EqualFold(appServiceTier, "dynamic") || strings.HasPrefix(appServiceTier, "elastic") || strings.HasPrefix(appServiceTier, "Elastic")) {
(strings.EqualFold(appServiceTier, "dynamic") || strings.HasPrefix(strings.ToLower(appServiceTier), "elastic")) {

@katbyte katbyte merged commit 707a9b8 into main Sep 16, 2021
@katbyte katbyte deleted the b/function-app-contentshare branch September 16, 2021 18:10
katbyte added a commit that referenced this pull request Sep 16, 2021
@katbyte
CHANGELOG.md for #13349
00e45ce
@github-actions
Copy link

This functionality has been released in v2.77.0 of the Terraform Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@ronorato ronorato mentioned this pull request Sep 28, 2021
Closed
@nluedema nluedema mentioned this pull request Sep 30, 2021
Closed
@shibayan shibayan mentioned this pull request Oct 4, 2021
Merged
@tombuildsstuff tombuildsstuff mentioned this pull request Oct 14, 2021
Closed
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@manicminer manicminer manicminer approved these changes

@katbyte katbyte katbyte approved these changes

Assignees

@jackofallops jackofallops

Labels
service/functions Function Apps size/L tests
Projects
None yet
Milestone
v2.77.0
3 participants
@jackofallops @manicminer @katbyte