removes unused properties

devops/azure/chart/templates/deployment.yaml

@@ -63,21 +63,6 @@ spec:
                 configMapKeyRef:
                   name: osdu-svc-properties
                   key: ENV_KEYVAULT
-            - name: AZURE_CLIENT_ID
-              valueFrom:
-                secretKeyRef:
-                  name: active-directory
-                  key: principal-clientid
-            - name: AZURE_CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: active-directory
-                  key: principal-clientpassword
-            - name: AZURE_TENANT_ID
-              valueFrom:
-                secretKeyRef:
-                  name: active-directory
-                  key: tenantid
             - name: aad_client_id
               valueFrom:
                 secretKeyRef:

provider/register-azure/pom.xml

@@ -30,10 +30,8 @@
     <version>1.0.0-SNAPSHOT</version>
     <properties>
         <osdu.register-core.version>1.0.0</osdu.register-core.version>
-        <osdu.corelibazure.version>0.0.52</osdu.corelibazure.version>
+        <osdu.corelibazure.version>0.0.58</osdu.corelibazure.version>
         <azure.version>1.21.0</azure.version>
-        <azure-security-keyvault-keys.version>4.1.4</azure-security-keyvault-keys.version>
-        <azure-mgmt-eventgrid.version>1.0.0-beta-3</azure-mgmt-eventgrid.version>
         <junit-jupiter.version>5.6.0</junit-jupiter.version>
         <mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>
     </properties>

provider/register-azure/src/main/java/org/opengroup/osdu/register/provider/azure/di/AzureBootstrapConfig.java

@@ -14,6 +14,7 @@
 
 package org.opengroup.osdu.register.provider.azure.di;
 
+import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.springframework.beans.factory.annotation.Value;
@@ -32,12 +33,11 @@ public class AzureBootstrapConfig {
   @Value("${azure.cosmosdb.database}")
   private String cosmosDBName;
 
-  @Value("${azure.tenantId}")
-  private String azureTenantId;
-
   @Value("${azure.appResourceId}")
   private String azureAppResourceId;
 
+  private String azureTenantId;
+
   @Bean
   @Named("KEY_VAULT_URL")
   public String keyVaultURL() {
@@ -50,4 +50,8 @@ public class AzureBootstrapConfig {
     return cosmosDBName;
   }
 
+  @Inject
+  public void setAzureTenantId(@Named("APP_DEV_SP_TENANT_ID") String azureTenantId) {
+    this.azureTenantId = azureTenantId;
+  }
 }
\ No newline at end of file

provider/register-azure/src/main/resources/application.properties

@@ -33,9 +33,6 @@ RECORDS_CHANGE_PUBSUB_ENDPOINT=${RECORDS_CHANGE_PUBSUB_ENDPOINT}
 azure.activedirectory.app-resource-id=${aad_client_id}
 
 # Azure AD configuration
-azure.clientId=${AZURE_CLIENT_ID}
-azure.clientSecret=${AZURE_CLIENT_SECRET}
-azure.tenantId=${AZURE_TENANT_ID}
 azure.appResourceId=${aad_client_id}
 
 # Azure KeyVault configuration