Merge pull request Azure#131 from StrawnSC/fix_registry_userpass_stil…

…l_set

`az containerapp registry set`: remove username/password if setting identity and vice versa

src/containerapp/HISTORY.rst

@@ -6,6 +6,7 @@ Release History
 0.3.7
 ++++++
 * 'az containerapp env create': fixed bug where "--internal-only" didn't work
+* 'az containerapp registry set': remove username/password if setting identity and vice versa
 
 0.3.6
 ++++++

src/containerapp/azext_containerapp/custom.py

@@ -1729,15 +1729,19 @@ def set_registry(cmd, name, resource_group_name, server, username=None, password
             updating_existing_registry = True
             if username:
                 r["username"] = username
+                r["identity"] = None
             if password:
                 r["passwordSecretRef"] = store_as_secret_and_return_secret_ref(
                     containerapp_def["properties"]["configuration"]["secrets"],
                     r["username"],
                     r["server"],
                     password,
                     update_existing_secret=True)
+                r["identity"] = None
             if identity:
                 r["identity"] = identity
+                r["username"] = None
+                r["passwordSecretRef"] = None
 
     # If not updating existing registry, add as new registry
     if not updating_existing_registry: