feat: Support AI Core by default in Service Binding Destination Loading (#358)

Co-authored-by: Matthias Kuhr <[email protected]>

Author: MatKuhr

cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/BtpServicePropertySuppliers.java

@@ -76,6 +76,8 @@ class BtpServicePropertySuppliers
                     .withUrlKey(BusinessLoggingOptions.READ_API, "readservice")
                     .withUrlKey(BusinessLoggingOptions.WRITE_API, "writeservice")
                     .factory());
+    static final OAuth2PropertySupplierResolver AI_CORE =
+        OAuth2PropertySupplierResolver.forServiceIdentifier(ServiceIdentifier.of("aicore"), AiCore::new);
 
     private static final List<OAuth2PropertySupplierResolver> DEFAULT_SERVICE_RESOLVERS = new ArrayList<>();
 
@@ -86,6 +88,7 @@ class BtpServicePropertySuppliers
         DEFAULT_SERVICE_RESOLVERS.add(WORKFLOW);
         DEFAULT_SERVICE_RESOLVERS.add(BUSINESS_LOGGING);
         DEFAULT_SERVICE_RESOLVERS.add(IDENTITY_AUTHENTICATION);
+        DEFAULT_SERVICE_RESOLVERS.add(AI_CORE);
     }
 
     static List<OAuth2PropertySupplierResolver> getDefaultServiceResolvers()
@@ -255,4 +258,19 @@ private KeyStore getClientKeyStore()
             }
         }
     }
+
+    private static class AiCore extends DefaultOAuth2PropertySupplier
+    {
+        AiCore( @Nonnull final ServiceBindingDestinationOptions options )
+        {
+            super(options, Collections.emptyList());
+        }
+
+        @Nonnull
+        @Override
+        public URI getServiceUri()
+        {
+            return getCredentialOrThrow(URI.class, "serviceurls", "AI_API_URL");
+        }
+    }
 }

cloudplatform/connectivity-oauth/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/BtpServicePropertySuppliersTest.java

@@ -5,6 +5,7 @@
 package com.sap.cloud.sdk.cloudplatform.connectivity;
 
 import static com.sap.cloud.sdk.cloudplatform.connectivity.BtpServiceOptions.IasOptions;
+import static com.sap.cloud.sdk.cloudplatform.connectivity.BtpServicePropertySuppliers.AI_CORE;
 import static com.sap.cloud.sdk.cloudplatform.connectivity.BtpServicePropertySuppliers.BUSINESS_LOGGING;
 import static com.sap.cloud.sdk.cloudplatform.connectivity.BtpServicePropertySuppliers.BUSINESS_RULES;
 import static com.sap.cloud.sdk.cloudplatform.connectivity.BtpServicePropertySuppliers.CONNECTIVITY;
@@ -16,6 +17,7 @@
 import static org.assertj.core.api.Assertions.entry;
 
 import java.lang.reflect.Modifier;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.KeyStore;
@@ -246,6 +248,35 @@ void testThrowsWithoutOption()
         }
     }
 
+    @Nested
+    @DisplayName( "AiCore" )
+    class AiCoreTest
+    {
+        final ServiceBinding binding =
+            bindingWithCredentials(
+                ServiceIdentifier.of("aicore"),
+                entry("serviceurls.AI_API_URL", "https://api.ai.internalprod.eu-central-1.aws.ml.hana.ondemand.com"),
+                entry("clientid", "client-id"),
+                entry("clientsecret", "client-secret"),
+                entry("url", "https://subaccount.authentication.sap.hana.ondemand.com"));
+
+        @Test
+        void testAiCore()
+        {
+            final ServiceBindingDestinationOptions options =
+                ServiceBindingDestinationOptions.forService(binding).build();
+
+            final OAuth2PropertySupplier sut = AI_CORE.resolve(options);
+
+            assertThat(sut.getServiceUri())
+                .isEqualTo(URI.create("https://api.ai.internalprod.eu-central-1.aws.ml.hana.ondemand.com"));
+            assertThat(sut.getClientIdentity().getId()).isEqualTo("client-id");
+            assertThat(sut.getClientIdentity().getSecret()).isEqualTo("client-secret");
+            assertThat(sut.getTokenUri())
+                .isEqualTo(URI.create("https://subaccount.authentication.sap.hana.ondemand.com"));
+        }
+    }
+
     @Nested
     @DisplayName( "Business Logging" )
     class BusinessLoggingTest

release_notes.md

@@ -12,7 +12,7 @@
 
 ### ✨ New Functionality
 
-- 
+- Support service bindings to the [SAP BTP AI Core Service](https://api.sap.com/api/AI_CORE_API) by default in the `ServiceBindingDestinationLoader` API. 
 
 ### 📈 Improvements