adop spring-cloud-azure-starter-storage-blob

Author: mucsi96

server/pom.xml

@@ -17,13 +17,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.azure</groupId>
-                <artifactId>azure-sdk-bom</artifactId>
-                <version>1.2.38</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>com.azure.spring</groupId>
                 <artifactId>spring-cloud-azure-dependencies</artifactId>
@@ -70,12 +63,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-storage-blob</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-identity</artifactId>
+            <groupId>com.azure.spring</groupId>
+            <artifactId>spring-cloud-azure-starter-storage-blob</artifactId>
         </dependency>
         <dependency>
             <groupId>com.azure.spring</groupId>

server/src/main/java/io/github/mucsi96/postgresbackuptool/configuration/StorageConfiguration.java

@@ -3,72 +3,11 @@
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-
-import com.azure.core.credential.TokenCredential;
-import com.azure.identity.ClientSecretCredentialBuilder;
-import com.azure.identity.WorkloadIdentityCredentialBuilder;
-import com.azure.storage.blob.BlobServiceClient;
-import com.azure.storage.blob.BlobServiceClientBuilder;
-
-import lombok.extern.slf4j.Slf4j;
 
 @Configuration
-@Slf4j
 public class StorageConfiguration {
-  @Value("${blobstorage.accountUrl}")
-  private String accountUrl;
-
-  @Profile("test")
-  @Bean
-  BlobServiceClient testBlobServiceClient(
-      @Value("${blobstorage.connectionString}") String connectionString)
-      throws Exception {
-
-    return new BlobServiceClientBuilder().connectionString(connectionString)
-        .buildClient();
-  }
-
-  @Profile("prod")
-  @Bean
-  BlobServiceClient prodBlobServiceClient(
-      @Value("${blobstorage.clientId}") String clientId,
-      @Value("${blobstorage.tenantId}") String tenantId) throws Exception {
-
-    TokenCredential tokenCredential = new WorkloadIdentityCredentialBuilder()
-        .clientId(clientId)
-        .tenantId(tenantId)
-        .build();
-
-    BlobServiceClient blobServiceClient = new BlobServiceClientBuilder()
-        .endpoint(accountUrl).credential(tokenCredential).buildClient();
-
-    return blobServiceClient;
-  }
-
-  @Profile("local")
-  @Bean
-  BlobServiceClient localBlobServiceClient(
-      @Value("${blobstorage.clientId}") String clientId,
-      @Value("${blobstorage.tenantId}") String tenantId,
-      @Value("${blobstorage.clientSecret}") String clientSecret)
-      throws Exception {
-
-    TokenCredential tokenCredential = new ClientSecretCredentialBuilder()
-        .clientId(clientId)
-        .tenantId(tenantId)
-        .clientSecret(clientSecret)
-        .build();
-
-    BlobServiceClient blobServiceClient = new BlobServiceClientBuilder()
-        .endpoint(accountUrl).credential(tokenCredential).buildClient();
-
-    return blobServiceClient;
-  }
-
   @Bean
   DateTimeFormatter backupDateTimeFormat() {
     return DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss")

server/src/main/resources/application-local.yml

@@ -1,3 +1,11 @@
 management:
   server:
     port: 8282
+
+spring:
+  cloud:
+    azure:
+      storage:
+        blob:
+          credential:
+            client-secret: ${api-client-secret}

server/src/main/resources/application-test.yml

@@ -1,5 +1,3 @@
-blobstorage:
-  connectionString: ${BLOBSTORAGE_CONNECTION_STRING:}
 databasesConfigPath: ${DATABASES_CONFIG_PATH}
 spring:
   cloud:
@@ -9,6 +7,9 @@ spring:
           property-sources: []
       active-directory:
         enabled: false
+      storage:
+        blob:
+          connection-string: ${BLOBSTORAGE_CONNECTION_STRING}
   autoconfigure:
     exclude:
       - "org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration"

server/src/main/resources/application.yml

@@ -15,11 +15,13 @@ spring:
         credential:
           client-id: ${api-client-id}
 
+      storage:
+        blob:
+          endpoint: ${storage-account-blob-url:}
+          credential:
+            client-id: ${api-client-id:}
+
 blobstorage:
-  clientId: ${api-client-id}
-  tenantId: ${tenant-id}
-  clientSecret: ${api-client-secret:}
-  accountUrl: ${storage-account-blob-url:}
   containerName: ${storage-account-container-name:}
 
 management: