From 058c0ef34455deaa15513607ea8a5a2e9e9cd937 Mon Sep 17 00:00:00 2001
From: Marten Deinum <mdeinum@gmail.com>
Date: Tue, 15 Oct 2019 15:47:32 +0200
Subject: [PATCH] Add deploy to cloudfoundry

---
 .circleci/config.yml                      | 53 ++++++++---------------
 src/main/resources/application.properties |  7 +--
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a1ef075..2517af8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,54 +1,32 @@
-version: 2
+version: 2.1
 # These environment variables must be set in CircleCI UI
 #
 # DOCKER_EMAIL   - login info for docker hub
 # DOCKER_USER
 # DOCKER_PASS
 #
-
+orbs:
+  cloudfoundry: circleci/cloudfoundry@1.0
 jobs:
   build:
     docker:
       - image: circleci/openjdk:8
+    working_directory: ~/securing-devops
     steps:
       - checkout
-      - setup_remote_docker:
-          version: 17.11.0-ce
-          docker_layer_caching: true 
-
       - restore_cache:
           key: securing-devops-boot-{{ checksum "pom.xml" }}
-
       - run: mvn dependency:go-offline
-
       - save_cache:
           paths:
             - ~/.m2
           key: securing-devops-boot-{{ checksum "pom.xml" }}
-
       - run: mvn verify
-
-      - run:
-          name: Save test results
-          command: |
-            mkdir -p ~/junit/
-            find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/junit/ \;
-          when: always
-
       - store_test_results:
-          path: ~/junit
-
-      - run:
-          name: Build Docker Container
-          command: |
-            mkdir -p target/dependencies
-            (cd target/dependencies; jar -xf ../*.jar)
-            docker build -f src/main/docker/Dockerfile -t mdeinum/${CIRCLE_PROJECT_REPONAME} .
-
-      - run:
-          name: Start Invoice Application (SSL)
-          command: docker run -p 443:8443 mdeinum/${CIRCLE_PROJECT_REPONAME}
-          background: true
+          path: target/surefire-reports
+      - store_artifacts: 
+          path: target/invoicer-0.0.1-SNAPSHOT.jar
+          destination: invoicer.jar
 
   dependency_check:
     docker:
@@ -66,7 +44,7 @@ jobs:
     steps:
       - run: |
           go get github.com/mozilla/tls-observatory/tlsobs
-          tlsobs -r 172.17.0.2
+          tlsobs invoicer.cfapps.io
   zap:
     docker:
         - image: circleci/openjdk:8
@@ -87,7 +65,7 @@ jobs:
             docker pull owasp/zap2docker-weekly && \
             docker run \
               --volumes-from zapwrk \
-              -t owasp/zap2docker-weekly zap-baseline.py -d -c zap-baseline.conf -t https://172.17.0.2/ || \
+              -t owasp/zap2docker-weekly zap-baseline.py -d -c zap-baseline.conf -t https://invoicer.cfapps.io/ || \
             if [ $? -ne 1 ]; then exit 0; else exit 1; fi;
            )
   publish:
@@ -108,15 +86,22 @@ workflows:
   default:
     jobs:
       - build
-      - tlsorb:
+      - cloudfoundry/push:
           requires: 
             - build
+          appname: invoicer
+          org: Conspect
+          space: development
+          package: package: ~/securing-devops/invoicer.jar
+      - tlsorb:
+          requires: 
+            - cloudfoundry/push
       - dependency_check:
           requires: 
             - build
       - zap:
           requires: 
-            - build
+            - cloudfoundry/push
       - publish:
           requires:
             - dependency_check
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 442b5a1..cdabe56 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,7 @@
-server.ssl.key-store=classpath:invoice-keystore.p12
-server.ssl.key-store-password=changeit
-server.ssl.key-password=changeit
+# server.port=8443
+# server.ssl.key-store=classpath:invoice-keystore.p12
+# server.ssl.key-store-password=changeit
+# server.ssl.key-password=changeit
 
 spring.jmx.enabled=false