Condense the application.yml, application-test.yml to keep things dep…

…loyable and runnable. (#184)
microsoft · Dec 21, 2022 · 757c7dd · 757c7dd
1 parent 321ea24
commit 757c7dd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 176 deletions.
diff --git a/agent/src/main/resources/application-test.yml b/agent/src/main/resources/application-test.yml
diff --git a/center/src/main/java/com/microsoft/hydralab/center/util/AuthUtil.java b/center/src/main/java/com/microsoft/hydralab/center/util/AuthUtil.java
@@ -25,22 +25,22 @@
 @Component
 public class AuthUtil {
 
-    @Value("${spring.security.oauth2.client.provider.azure-ad.token-uri}")
+    @Value("${spring.security.oauth2.client.provider.azure-ad.token-uri:}")
     String tokenUrl;
-    @Value("${spring.security.oauth2.client.provider.azure-ad.photo-uri}")
+    @Value("${spring.security.oauth2.client.provider.azure-ad.photo-uri:}")
     String photoUrl;
-    @Value("${spring.security.oauth2.client.provider.azure-ad.authorization-uri}")
+    @Value("${spring.security.oauth2.client.provider.azure-ad.authorization-uri:}")
     String authorizationUri;
 
-    @Value("${spring.security.oauth2.client.registration.azure-client.client-id}")
+    @Value("${spring.security.oauth2.client.registration.azure-client.client-id:}")
     String clientId;
-    @Value("${spring.security.oauth2.client.registration.azure-client.client-secret}")
+    @Value("${spring.security.oauth2.client.registration.azure-client.client-secret:}")
     String clientSecret;
-    @Value("${spring.security.oauth2.client.registration.azure-client.redirect-uri}")
+    @Value("${spring.security.oauth2.client.registration.azure-client.redirect-uri:}")
     String redirectUri;
-    @Value("${spring.security.oauth2.client.registration.azure-client.ignore-uri}")
+    @Value("${spring.security.oauth2.client.registration.azure-client.ignore-uri:}")
     String ignoreUri;
-    @Value("${spring.security.oauth2.client.registration.azure-client.scope}")
+    @Value("${spring.security.oauth2.client.registration.azure-client.scope:}")
     String scope;
 
     Map<String, Boolean> urlMapping = null;

diff --git a/center/src/main/resources/application-test.yml b/center/src/main/resources/application-test.yml
@@ -1,75 +1,2 @@
-server:
-  port: 9886
-  compression:
-    enabled: true
-    min-response-size: 102400
-spring:
-  application:
-    name: device-network-center
-  output:
-    ansi:
-      enabled: always
-  servlet:
-    multipart:
-      max-file-size: 1024MB
-      max-request-size: 2048MB
-  datasource:
-    url: jdbc:sqlite:hydra_lab_center_db.sqlite
-    username: sqlite
-    password: 98765432
-    driver-class-name: org.sqlite.JDBC
-  jpa:
-    database-platform: org.sqlite.hibernate.dialect.SQLiteDialect
-    show-sql: false
-    hibernate:
-      dialect: org.sqlite.hibernate.dialect.SQLiteDialect
-      ddl-auto: update
-    properties:
-      hibernate:
-        format_sql: false
-        order_inserts: true
-        order_updates: true
-        jdbc:
-          batch_size: 400
-          batch_versioned_data: true
-  security:
-    oauth2:
-      enabled: false
-
-# log file split
-logging:
-  config: classpath:logback-common.xml
-  level:
-    org.hibernate.SQL: INFO
-
 app:
-  access-token-limit: 2
-  # Mail Address Format
-  default-user: '[email protected]'
-  blob:
-    connection: ''
-    fileLimitDay: 6
-    CDNUrl: ${CDN_URL:@null}
-    SASExpiryTimeFront: ${BLOB_SAS_EXPIRY_FRONT:120}
-    SASExpiryTimeAgent: ${BLOB_SAS_EXPIRY_AGENT:120}
-    SASExpiryUpdate: ${BLOB_SAS_EXPIRY_UPDATE:10}
-    timeUnit: ${TIME_UNIT:MINUTES}
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: prometheus
-      health:
-        show-details: always
-      metrics:
-        tags:
-          application: ${spring.application.name}
-  metrics:
-    export:
-      prometheus:
-        pushgateway:
-          enabled: ${PUSHGATEWAY_ENABLED:false}
-          base-url: http://localhost:9091
-          job: ${spring.application.name}
-          push-rate: 10s
+  default-user: '[email protected]'
diff --git a/center/src/main/resources/application.yml b/center/src/main/resources/application.yml
@@ -35,22 +35,6 @@ spring:
   security:
     oauth2:
       enabled: false
-      client:
-        provider:
-          azure-ad:
-            authorization-uri: https://login.microsoftonline.com/${MICROSOFT_PROVIDER_TENANT_ID}/oauth2/v2.0/authorize
-            token-uri: https://login.microsoftonline.com/${MICROSOFT_PROVIDER_TENANT_ID}/oauth2/v2.0/token
-            jwk-set-uri: https://login.microsoftonline.com/${MICROSOFT_PROVIDER_TENANT_ID}/discovery/v2.0/keys
-            photo-uri: https://graph.microsoft.com/v1.0/me/photo/$value
-        registration:
-          azure-client:
-            provider: azure-ad
-            client-id: ${MICROSOFT_PROVIDER_CLIENT_ID}
-            client-secret: ${MICROSOFT_PROVIDER_AUTHENTICATION_SECRET}
-            authorization-grant-type: authorization_code
-            redirect-uri: 'http://localhost:9886/api/auth' # if nginx enabled, switch to port of nginx
-            ignore-uri: '/api/auth,/agent/connect'
-            scope: 'https://graph.microsoft.com/User.Read'
 
 # log file split
 logging:
@@ -62,7 +46,7 @@ app:
   batteryStrategy: ${BATTERY_STRATEGY:Economic}
   access-token-limit: 2
   # Mail Address Format
-  default-user: ${DEFAULT_USER:@null}
+  default-user: ${DEFAULT_USER:[email protected]}
   blob:
     connection: ${BLOB_CONNECTION_STR}
     fileLimitDay: 6