cumulusci-plus 5.0.35__py3-none-any.whl → 5.0.43__py3-none-any.whl

cumulusci/tasks/salesforce/tests/test_update_external_credential.py

@@ -109,7 +109,7 @@ class TestExternalCredentialParameter:
         assert param.auth_provider == "MyAuthProvider"
         result = param.get_external_credential_parameter()
         assert result["parameterType"] == "AuthProvider"
-        assert result["parameterValue"] == "MyAuthProvider"
+        assert result["authProvider"] == "MyAuthProvider"
         assert result["parameterName"] == "AuthProvider"
 
     def test_parameter_with_auth_provider_url(self):
@@ -231,7 +231,9 @@ class TestTransformExternalCredentialParameter:
                 auth_provider="MY_AUTH_PROVIDER"
             )
             result = param.get_external_credential_parameter()
-            assert result["parameterValue"] == "EnvAuthProvider"
+            assert (
+                result["authProvider"] == "MY_AUTH_PROVIDER"
+            )  # Transform doesn't apply to authProvider field
 
     def test_transform_parameter_missing_env(self):
         """Test parameter transformation with missing environment variable"""
@@ -507,6 +509,23 @@ class TestUpdateExternalCredential:
     @responses.activate
     def test_update_external_credential_with_namespace(self):
         """Test update of external credential with namespace"""
+        # Mock SF API version discovery
+        responses.add(
+            method="GET",
+            url="https://test.salesforce.com/services/data",
+            json=[{"version": CURRENT_SF_API_VERSION}],
+            status=200,
+        )
+
+        # Mock installed packages query
+        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+SubscriberPackage.Id%2C+SubscriberPackage.Name%2C+SubscriberPackage.NamespacePrefix%2C+SubscriberPackageVersionId+FROM+InstalledSubscriberPackage",
+            json={"size": 0, "records": []},
+            status=200,
+        )
+
         task = create_task(
             UpdateExternalCredential,
             {
@@ -517,7 +536,6 @@ class TestUpdateExternalCredential:
         )
 
         ext_cred_id = "0XE1234567890ABC"
-        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
 
         # Mock query for external credential ID
         responses.add(
@@ -556,7 +574,7 @@ class TestUpdateExternalCredential:
         )
 
         task()
-        assert len(responses.calls) == 3
+        assert len(responses.calls) == 5  # 2 setup + 3 task calls
 
     @responses.activate
     def test_update_external_credential_add_new_parameter(self):
@@ -758,6 +776,23 @@ class TestUpdateExternalCredential:
     @responses.activate
     def test_update_external_credential_no_existing_parameters(self):
         """Test update when external credential has no existing parameters"""
+        # Mock SF API version discovery
+        responses.add(
+            method="GET",
+            url="https://test.salesforce.com/services/data",
+            json=[{"version": CURRENT_SF_API_VERSION}],
+            status=200,
+        )
+
+        # Mock installed packages query
+        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+SubscriberPackage.Id%2C+SubscriberPackage.Name%2C+SubscriberPackage.NamespacePrefix%2C+SubscriberPackageVersionId+FROM+InstalledSubscriberPackage",
+            json={"size": 0, "records": []},
+            status=200,
+        )
+
         task = create_task(
             UpdateExternalCredential,
             {
@@ -767,7 +802,6 @@ class TestUpdateExternalCredential:
         )
 
         ext_cred_id = "0XE1234567890ABC"
-        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
 
         # Mock query for external credential ID
         responses.add(
@@ -794,11 +828,28 @@ class TestUpdateExternalCredential:
         )
 
         task()
-        assert len(responses.calls) == 3
+        assert len(responses.calls) == 5  # 2 setup + 3 task calls
 
     @responses.activate
     def test_update_external_credential_with_multiple_parameters(self):
         """Test update with multiple parameters"""
+        # Mock SF API version discovery
+        responses.add(
+            method="GET",
+            url="https://test.salesforce.com/services/data",
+            json=[{"version": CURRENT_SF_API_VERSION}],
+            status=200,
+        )
+
+        # Mock installed packages query
+        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+SubscriberPackage.Id%2C+SubscriberPackage.Name%2C+SubscriberPackage.NamespacePrefix%2C+SubscriberPackageVersionId+FROM+InstalledSubscriberPackage",
+            json={"size": 0, "records": []},
+            status=200,
+        )
+
         auth_header = HttpHeader(name="Authorization", value="Bearer token123")
         jwt_claim = ExtParameter(name="sub", value='{"sub":"user"}')
         task = create_task(
@@ -814,7 +865,6 @@ class TestUpdateExternalCredential:
         )
 
         ext_cred_id = "0XE1234567890ABC"
-        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
 
         # Mock query for external credential ID
         responses.add(
@@ -853,7 +903,7 @@ class TestUpdateExternalCredential:
         )
 
         task()
-        assert len(responses.calls) == 3
+        assert len(responses.calls) == 5  # 2 setup + 3 task calls
 
     @responses.activate
     def test_update_external_credential_with_sequence_number(self):
@@ -910,3 +960,468 @@ class TestUpdateExternalCredential:
 
         task()
         assert len(responses.calls) == 3
+
+    @responses.activate
+    def test_auth_provider_removes_external_auth_identity_provider(self):
+        """Test that adding AuthProvider removes ExternalAuthIdentityProvider"""
+        # Mock SF API version discovery
+        responses.add(
+            method="GET",
+            url="https://test.salesforce.com/services/data",
+            json=[{"version": CURRENT_SF_API_VERSION}],
+            status=200,
+        )
+
+        # Mock installed packages query
+        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+SubscriberPackage.Id%2C+SubscriberPackage.Name%2C+SubscriberPackage.NamespacePrefix%2C+SubscriberPackageVersionId+FROM+InstalledSubscriberPackage",
+            json={"size": 0, "records": []},
+            status=200,
+        )
+
+        task = create_task(
+            UpdateExternalCredential,
+            {
+                "name": "testExtCred",
+                "parameters": [{"auth_provider": "MyAuthProvider"}],
+            },
+        )
+
+        ext_cred_id = "0XE1234567890ABC"
+
+        # Mock query for external credential ID
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+Id+FROM+ExternalCredential+WHERE+DeveloperName%3D%27testExtCred%27+LIMIT+1",
+            json={"size": 1, "records": [{"Id": ext_cred_id}]},
+            status=200,
+        )
+
+        # Mock get external credential object with ExternalAuthIdentityProvider
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={
+                "Metadata": {
+                    "externalCredentialParameters": [
+                        {
+                            "parameterType": "ExternalAuthIdentityProvider",
+                            "parameterName": "ExternalAuthIdentityProvider",
+                            "externalAuthIdentityProvider": "OldProvider",
+                            "authProvider": None,
+                            "certificate": None,
+                            "description": None,
+                            "parameterGroup": "DefaultGroup",
+                            "parameterValue": None,
+                            "sequenceNumber": None,
+                        },
+                        {
+                            "parameterType": "AuthParameter",
+                            "parameterName": "Scope",
+                            "parameterValue": "scope",
+                            "authProvider": None,
+                            "certificate": None,
+                            "description": None,
+                            "externalAuthIdentityProvider": None,
+                            "parameterGroup": "DefaultGroup",
+                            "sequenceNumber": None,
+                        },
+                    ],
+                }
+            },
+            status=200,
+        )
+
+        # Mock update external credential
+        responses.add(
+            method="PATCH",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={},
+            status=200,
+        )
+
+        task()
+        assert len(responses.calls) == 5  # 2 setup + 3 task calls
+
+        # Verify the PATCH request removed ExternalAuthIdentityProvider
+        patch_call = responses.calls[4]  # Last call is the PATCH
+        updated_params = patch_call.request.body
+        import json
+
+        body = json.loads(updated_params)
+        params = body["Metadata"]["externalCredentialParameters"]
+
+        # Should not contain ExternalAuthIdentityProvider
+        assert not any(
+            p.get("parameterType") == "ExternalAuthIdentityProvider" for p in params
+        )
+        # Should contain AuthProvider
+        assert any(p.get("parameterType") == "AuthProvider" for p in params)
+        # Should still contain AuthParameter
+        assert any(p.get("parameterType") == "AuthParameter" for p in params)
+
+    @responses.activate
+    def test_external_auth_identity_provider_removes_auth_provider(self):
+        """Test that adding ExternalAuthIdentityProvider removes AuthProvider"""
+        # Mock SF API version discovery
+        responses.add(
+            method="GET",
+            url="https://test.salesforce.com/services/data",
+            json=[{"version": CURRENT_SF_API_VERSION}],
+            status=200,
+        )
+
+        # Mock installed packages query
+        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+SubscriberPackage.Id%2C+SubscriberPackage.Name%2C+SubscriberPackage.NamespacePrefix%2C+SubscriberPackageVersionId+FROM+InstalledSubscriberPackage",
+            json={"size": 0, "records": []},
+            status=200,
+        )
+
+        task = create_task(
+            UpdateExternalCredential,
+            {
+                "name": "testExtCred",
+                "parameters": [
+                    {"external_auth_identity_provider": "MyExternalAuthProvider"}
+                ],
+            },
+        )
+
+        ext_cred_id = "0XE1234567890ABC"
+
+        # Mock query for external credential ID
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+Id+FROM+ExternalCredential+WHERE+DeveloperName%3D%27testExtCred%27+LIMIT+1",
+            json={"size": 1, "records": [{"Id": ext_cred_id}]},
+            status=200,
+        )
+
+        # Mock get external credential object with AuthProvider
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={
+                "Metadata": {
+                    "externalCredentialParameters": [
+                        {
+                            "parameterType": "AuthProvider",
+                            "parameterName": "AuthProvider",
+                            "authProvider": "OldAuthProvider",
+                            "certificate": None,
+                            "description": None,
+                            "externalAuthIdentityProvider": None,
+                            "parameterGroup": "DefaultGroup",
+                            "parameterValue": "OldAuthProvider",
+                            "sequenceNumber": None,
+                        },
+                        {
+                            "parameterType": "AuthParameter",
+                            "parameterName": "Scope",
+                            "parameterValue": "scope",
+                            "authProvider": None,
+                            "certificate": None,
+                            "description": None,
+                            "externalAuthIdentityProvider": None,
+                            "parameterGroup": "DefaultGroup",
+                            "sequenceNumber": None,
+                        },
+                    ],
+                }
+            },
+            status=200,
+        )
+
+        # Mock update external credential
+        responses.add(
+            method="PATCH",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={},
+            status=200,
+        )
+
+        task()
+        assert len(responses.calls) == 5  # 2 setup + 3 task calls
+
+        # Verify the PATCH request removed AuthProvider
+        patch_call = responses.calls[4]  # Last call is the PATCH
+        updated_params = patch_call.request.body
+        import json
+
+        body = json.loads(updated_params)
+        params = body["Metadata"]["externalCredentialParameters"]
+
+        # Should not contain AuthProvider
+        assert not any(p.get("parameterType") == "AuthProvider" for p in params)
+        # Should contain ExternalAuthIdentityProvider
+        assert any(
+            p.get("parameterType") == "ExternalAuthIdentityProvider" for p in params
+        )
+        # Should still contain AuthParameter
+        assert any(p.get("parameterType") == "AuthParameter" for p in params)
+
+    @responses.activate
+    def test_multiple_auth_providers_removed(self):
+        """Test that multiple conflicting parameters are removed"""
+        # Mock SF API version discovery
+        responses.add(
+            method="GET",
+            url="https://test.salesforce.com/services/data",
+            json=[{"version": CURRENT_SF_API_VERSION}],
+            status=200,
+        )
+
+        # Mock installed packages query
+        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+SubscriberPackage.Id%2C+SubscriberPackage.Name%2C+SubscriberPackage.NamespacePrefix%2C+SubscriberPackageVersionId+FROM+InstalledSubscriberPackage",
+            json={"size": 0, "records": []},
+            status=200,
+        )
+
+        task = create_task(
+            UpdateExternalCredential,
+            {
+                "name": "testExtCred",
+                "parameters": [
+                    {"external_auth_identity_provider": "MyExternalAuthProvider"}
+                ],
+            },
+        )
+
+        ext_cred_id = "0XE1234567890ABC"
+
+        # Mock query for external credential ID
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+Id+FROM+ExternalCredential+WHERE+DeveloperName%3D%27testExtCred%27+LIMIT+1",
+            json={"size": 1, "records": [{"Id": ext_cred_id}]},
+            status=200,
+        )
+
+        # Mock get external credential object with multiple AuthProvider parameters
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={
+                "Metadata": {
+                    "externalCredentialParameters": [
+                        {
+                            "parameterType": "AuthProvider",
+                            "parameterName": "AuthProvider",
+                            "authProvider": "Provider1",
+                            "certificate": None,
+                            "description": None,
+                            "externalAuthIdentityProvider": None,
+                            "parameterGroup": "Group1",
+                            "parameterValue": "Provider1",
+                            "sequenceNumber": None,
+                        },
+                        {
+                            "parameterType": "AuthProvider",
+                            "parameterName": "AuthProvider",
+                            "authProvider": "Provider2",
+                            "certificate": None,
+                            "description": None,
+                            "externalAuthIdentityProvider": None,
+                            "parameterGroup": "Group2",
+                            "parameterValue": "Provider2",
+                            "sequenceNumber": None,
+                        },
+                    ],
+                }
+            },
+            status=200,
+        )
+
+        # Mock update external credential
+        responses.add(
+            method="PATCH",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={},
+            status=200,
+        )
+
+        task()
+        assert len(responses.calls) == 5  # 2 setup + 3 task calls
+
+        # Verify all AuthProvider parameters were removed
+        patch_call = responses.calls[4]  # Last call is the PATCH
+        updated_params = patch_call.request.body
+        import json
+
+        body = json.loads(updated_params)
+        params = body["Metadata"]["externalCredentialParameters"]
+
+        # Should not contain any AuthProvider
+        auth_providers = [p for p in params if p.get("parameterType") == "AuthProvider"]
+        assert len(auth_providers) == 0
+
+    @responses.activate
+    def test_no_conflict_when_no_existing_parameters(self):
+        """Test that no error occurs when there are no existing conflicting parameters"""
+        # Mock SF API version discovery
+        responses.add(
+            method="GET",
+            url="https://test.salesforce.com/services/data",
+            json=[{"version": CURRENT_SF_API_VERSION}],
+            status=200,
+        )
+
+        # Mock installed packages query
+        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+SubscriberPackage.Id%2C+SubscriberPackage.Name%2C+SubscriberPackage.NamespacePrefix%2C+SubscriberPackageVersionId+FROM+InstalledSubscriberPackage",
+            json={"size": 0, "records": []},
+            status=200,
+        )
+
+        task = create_task(
+            UpdateExternalCredential,
+            {
+                "name": "testExtCred",
+                "parameters": [{"auth_provider": "MyAuthProvider"}],
+            },
+        )
+
+        ext_cred_id = "0XE1234567890ABC"
+
+        # Mock query for external credential ID
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+Id+FROM+ExternalCredential+WHERE+DeveloperName%3D%27testExtCred%27+LIMIT+1",
+            json={"size": 1, "records": [{"Id": ext_cred_id}]},
+            status=200,
+        )
+
+        # Mock get external credential object with no parameters
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={
+                "Metadata": {
+                    "externalCredentialParameters": [],
+                }
+            },
+            status=200,
+        )
+
+        # Mock update external credential
+        responses.add(
+            method="PATCH",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={},
+            status=200,
+        )
+
+        task()
+        assert len(responses.calls) == 5  # 2 setup + 3 task calls
+
+    @responses.activate
+    def test_update_existing_auth_provider_removes_external_auth(self):
+        """Test updating existing AuthProvider also removes ExternalAuthIdentityProvider"""
+        # Mock SF API version discovery
+        responses.add(
+            method="GET",
+            url="https://test.salesforce.com/services/data",
+            json=[{"version": CURRENT_SF_API_VERSION}],
+            status=200,
+        )
+
+        # Mock installed packages query
+        tooling_url = f"https://test.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling"
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+SubscriberPackage.Id%2C+SubscriberPackage.Name%2C+SubscriberPackage.NamespacePrefix%2C+SubscriberPackageVersionId+FROM+InstalledSubscriberPackage",
+            json={"size": 0, "records": []},
+            status=200,
+        )
+
+        task = create_task(
+            UpdateExternalCredential,
+            {
+                "name": "testExtCred",
+                "parameters": [{"auth_provider": "UpdatedAuthProvider"}],
+            },
+        )
+
+        ext_cred_id = "0XE1234567890ABC"
+
+        # Mock query for external credential ID
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/query/?q=SELECT+Id+FROM+ExternalCredential+WHERE+DeveloperName%3D%27testExtCred%27+LIMIT+1",
+            json={"size": 1, "records": [{"Id": ext_cred_id}]},
+            status=200,
+        )
+
+        # Mock get external credential object with both AuthProvider and ExternalAuthIdentityProvider
+        responses.add(
+            method="GET",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={
+                "Metadata": {
+                    "externalCredentialParameters": [
+                        {
+                            "parameterType": "AuthProvider",
+                            "parameterName": "AuthProvider",
+                            "authProvider": "OldAuthProvider",
+                            "certificate": None,
+                            "description": None,
+                            "externalAuthIdentityProvider": None,
+                            "parameterGroup": "DefaultGroup",
+                            "parameterValue": "OldAuthProvider",
+                            "sequenceNumber": None,
+                        },
+                        {
+                            "parameterType": "ExternalAuthIdentityProvider",
+                            "parameterName": "ExternalAuthIdentityProvider",
+                            "externalAuthIdentityProvider": "SomeProvider",
+                            "authProvider": None,
+                            "certificate": None,
+                            "description": None,
+                            "parameterGroup": "DefaultGroup",
+                            "parameterValue": None,
+                            "sequenceNumber": None,
+                        },
+                    ],
+                }
+            },
+            status=200,
+        )
+
+        # Mock update external credential
+        responses.add(
+            method="PATCH",
+            url=f"{tooling_url}/sobjects/ExternalCredential/{ext_cred_id}",
+            json={},
+            status=200,
+        )
+
+        task()
+        assert len(responses.calls) == 5  # 2 setup + 3 task calls
+
+        # Verify ExternalAuthIdentityProvider was removed
+        patch_call = responses.calls[4]  # Last call is the PATCH
+        updated_params = patch_call.request.body
+        import json
+
+        body = json.loads(updated_params)
+        params = body["Metadata"]["externalCredentialParameters"]
+
+        # Should have 2 AuthProviders (old one updated + new one added) and no ExternalAuthIdentityProvider
+        # Actually, since authProvider value is different, it adds a new AuthProvider
+        # So we have old AuthProvider updated to new value, no new one is added
+        auth_providers = [p for p in params if p.get("parameterType") == "AuthProvider"]
+        assert len(auth_providers) >= 1
+        # Should not contain ExternalAuthIdentityProvider
+        assert not any(
+            p.get("parameterType") == "ExternalAuthIdentityProvider" for p in params
+        )