Merge pull request #7 from peterrsongg/springboot

remove password logging add ucp logging

Author: Kuassim

MtdrSpring/backend/src/main/java/com/springboot/MyTodoList/config/OracleConfiguration.java

@@ -37,16 +37,14 @@ public DataSource dataSource() throws SQLException{
         ds.setUser(env.getProperty("db_user"));
         logger.info("Using Username " + env.getProperty("db_user"));
         ds.setPassword(env.getProperty("dbpassword"));
-        logger.info("Using Password: " + env.getProperty("dbpassword"));
-//        // For local testing
+//        For local testing
 //        ds.setDriverType(dbSettings.getDriver_class_name());
 //        logger.info("Using Driver " + dbSettings.getDriver_class_name());
 //        ds.setURL(dbSettings.getUrl());
 //        logger.info("Using URL: " + dbSettings.getUrl());
 //        ds.setUser(dbSettings.getUsername());
 //        logger.info("Using Username: " + dbSettings.getUsername());
 //        ds.setPassword(dbSettings.getPassword());
-//        logger.info("Using Password: " + dbSettings.getPassword());
         return ds;
     }
 }

MtdrSpring/backend/src/main/resources/application.properties

@@ -13,4 +13,9 @@ spring.datasource.oracleucp.sql-for-validate-connection=select * from dual
 spring.datasource.oracleucp.connection-pool-name=connectionPoolName1
 spring.datasource.oracleucp.initial-pool-size=15
 spring.datasource.oracleucp.min-pool-size=10
-spring.datasource.oracleucp.max-pool-size=30
+spring.datasource.oracleucp.max-pool-size=30
+
+##Logging properties for UCP
+logging.level.root=trace
+logging.file.name=logs.log
+logging.level.oracle.ucp=trace

MtdrSpring/backend/target/classes/application.properties

@@ -0,0 +1,21 @@
+#spring.jpa.database-platform=org.hibernate.dialect.Oracle12cDialect
+#oracle.jdbc.fanEnabled=false
+###this is not used when deployed in kubernetes. Just for local testing
+#spring.datasource.url=jdbc:oracle:thin:@petertestdb_medium?TNS_ADMIN=/Users/psong/Downloads/Wallet_petertestDB
+#spring.datasource.username=TODOUSER
+#spring.datasource.password=PeterSong123
+
+##Properties of UCP
+spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
+spring.datasource.type=oracle.ucp.jdbc.PoolDataSource
+spring.datasource.oracleucp.connection-factory-class-name=oracle.jdbc.pool.OracleDataSource
+spring.datasource.oracleucp.sql-for-validate-connection=select * from dual
+spring.datasource.oracleucp.connection-pool-name=connectionPoolName1
+spring.datasource.oracleucp.initial-pool-size=15
+spring.datasource.oracleucp.min-pool-size=10
+spring.datasource.oracleucp.max-pool-size=30
+
+##Logging properties for UCP
+logging.level.root=trace
+logging.file.name=logs.log
+logging.level.oracle.ucp=trace

MtdrSpring/backend/target/classes/application.yaml

@@ -0,0 +1,12 @@
+spring:
+  datasource:
+    driver_class_name: oracle.jdbc.OracleDriver
+    password: PeterSong123
+    url: jdbc:oracle:thin:@petertestdb_medium?TNS_ADMIN=/Users/psong/Downloads/Wallet_petertestDB
+    username: TODOUSER
+  jpa:
+    database: ORACLE
+    database-platform: org.hibernate.dialect.Oracle12cDialect
+    hibernate:
+      ddl-auto: none
+    show-sql: true

MtdrSpring/backend/target/classes/todolistapp-springboot.yaml

@@ -0,0 +1,67 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: todolistapp-springboot-service
+spec:
+  type: LoadBalancer
+  ports:
+    - port: 80
+      protocol: TCP
+      targetPort: 8080
+  selector:
+    app: todolistapp-springboot
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: todolistapp-springboot-deployment
+spec:
+  selector:
+    matchLabels:
+      app: todolistapp-springboot
+  replicas: 2
+  template:
+    metadata:
+      labels:
+        app: todolistapp-springboot
+        version: v1
+    spec:
+      containers:
+        - name: todolistapp-springboot
+          image: %DOCKER_REGISTRY%/todolistapp-springboot:0.1
+          imagePullPolicy: Always
+          env:
+            - name: db_user
+              value: "TODOUSER"
+            - name: db_url
+              value: "jdbc:oracle:thin:@%TODO_PDB_NAME%_tp?TNS_ADMIN=/mtdrworkshop/creds"
+            - name: todo.table.name
+              value: "todoitem"
+            - name: driver_class_name
+              value: "oracle.jdbc.OracleDriver"
+            - name: OCI_REGION
+              value: "%OCI_REGION%"
+            - name: dbpassword
+              valueFrom:
+                secretKeyRef:
+                  name: dbuser
+                  key: dbpassword
+                  optional: true
+          volumeMounts:
+            - name: creds
+              mountPath: /mtdrworkshop/creds
+          ports:
+            - containerPort: 8080
+      restartPolicy: Always
+      volumes:
+        - name: creds
+          secret:
+            secretName: db-wallet-secret
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              app: todolistapp-springboot
+---