Skip to content

Fix bug causing Docker Password to be removed from appsettings in Set-AzWebApp(Slot) #13866

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.

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

Merged
merged 2 commits into from
Jan 7, 2021
Merged

Conversation

Willem-J-an
Copy link
Contributor

Description

Fix for issue: #13865

Streamlined actions for docker password with the actions for other docker related app settings, so:

  1. Check if the parameter is provided
  2. Remove the existing app setting
  3. Set the new app setting to the parameter value

This should cause the app setting not to be removed when the parameter is not provided.

Unfortunately I have been unable to build the project locally:
Assets file '\azure-powershell\src\Websites\Websites.Test\obj\project.asses\Websites.Test\obj\project.assets.json' doesn't have a target for 'netcoreapp2.2'. Ensure that restore has run and that you have included 'netcoreapp2.2' in the TargetFrameworks for your project. [C:\hell\src\Websites\Websites.Test\azure-powershell\src\Websites\Websites.Test\Websites.Test.csproj] [\azure-powershell\build.proj].
I installed dotnet 5 and dotnet 2.2, but no luck. I have therefore not been able to run tests for these changes.

Checklist

  • I have read the Submitting Changes section of CONTRIBUTING.md
  • The title of the PR is clear and informative
  • The appropriate ChangeLog.md file(s) has been updated:
    • For any service, the ChangeLog.md file can be found at src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md
    • A snippet outlining the change(s) made in the PR should be written under the ## Upcoming Release header -- no new version header should be added
  • The PR does not introduce breaking changes
  • If applicable, the changes made in the PR have proper test coverage
  • For public API changes to cmdlets:
    • a cmdlet design review was approved for the changes in this repository (Microsoft internal only)
      • {Please put the link here}
    • the markdown help files have been regenerated using the commands listed here

@ghost ghost added the customer-reported label Jan 1, 2021
@ghost
Copy link

ghost commented Jan 1, 2021

Thank you for your contribution Willem-J-an! We will review the pull request and get back to you soon.

@isra-fel isra-fel self-assigned this Jan 4, 2021
@isra-fel
Copy link
Member

isra-fel commented Jan 4, 2021

/azp run

@isra-fel isra-fel added the App Services aka WebSites label Jan 4, 2021
@azure-pipelines
Copy link
Contributor

Azure Pipelines successfully started running 3 pipeline(s).

@Willem-J-an
Copy link
Contributor Author

First build failed due to SecureString being compared to a string, pushed a fix for this

ContainerRegistryPassword.ConvertToString() != string.Empty

@isra-fel
Copy link
Member

isra-fel commented Jan 4, 2021

Thanks @Willem-J-an , this code is related to pull request #12107 by @vinisoto .
Hi Vini, could you review this one? Thank you!

@isra-fel isra-fel requested a review from vinisoto January 4, 2021 09:09
vinisoto
vinisoto previously approved these changes Jan 5, 2021
Copy link
Contributor

@vinisoto vinisoto left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thank you for fixing this.

Adding @panchagnula as FYI

@isra-fel
Copy link
Member

isra-fel commented Jan 6, 2021

/azp run

@azure-pipelines
Copy link
Contributor

Azure Pipelines successfully started running 3 pipeline(s).

@Willem-J-an
Copy link
Contributor Author

Rebased to resolve conflict on the changelog

vinisoto
vinisoto previously approved these changes Jan 6, 2021
to make sure the versioning script will handle it correctly
Copy link
Member

@isra-fel isra-fel left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@isra-fel
Copy link
Member

isra-fel commented Jan 7, 2021

/azp run

@azure-pipelines
Copy link
Contributor

Azure Pipelines successfully started running 3 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants