BCDA-2212 Maintenance: Removing SSAS code and artifacts (#420)

.travis.yml

@@ -45,4 +45,3 @@ before_script:
 script:
   - make docker-bootstrap
   - make test
-  - make test-ssas

Dockerfiles/Dockerfile.ssas

@@ -11,11 +11,11 @@ RUN go get -u github.com/derekparker/delve/cmd/dlv
 RUN go get github.com/BurntSushi/toml
 RUN go get github.com/howeyc/fsnotify
 RUN go get github.com/mattn/go-colorable
+RUN go get github.com/CMSgov/bcda-ssas-app/ssas/service/main
 
-WORKDIR /go/src/github.com/CMSgov/bcda-app/ssas
-COPY . .
+WORKDIR /go/src/github.com/CMSgov/bcda-app/
+COPY vendor/github.com/pressly/fresh vendor/github.com/pressly/fresh
 RUN go install ./vendor/github.com/pressly/fresh
-RUN dep ensure
 
-WORKDIR /go/src/github.com/CMSgov/bcda-app/ssas
-CMD ["fresh", "-o", "ssas-service", "-p", "./service/main", "-r", "--migrate-and-start"]
+WORKDIR /go/src/github.com/CMSgov/bcda-ssas-app/ssas
+CMD ["fresh", "-o", "ssas-service", "-p", "./service/main", "-r", "--start"]

Dockerfiles/Dockerfile.ssas-migrate

@@ -0,0 +1,9 @@
+FROM migrate/migrate
+
+RUN apk update upgrade && \
+    apk add git
+
+RUN mkdir -p /go/src/github.com/CMSgov
+
+WORKDIR /go/src/github.com/CMSgov
+RUN git clone https://github.com/CMSgov/bcda-ssas-app.git

Gopkg.toml

@@ -52,7 +52,3 @@
 [[constraint]]
   name = "github.com/aws/aws-sdk-go"
   version = "1.16.1"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/patrickmn/go-cache"

Makefile

@@ -13,17 +13,13 @@ package:
 	-v ${PWD}:/go/src/github.com/CMSgov/bcda-app packaging $(version)
 
 lint:
-	docker-compose -f docker-compose.test.yml run --rm tests golangci-lint run --deadline=3m --skip-dirs=ssas
-	docker-compose -f docker-compose.test.yml run --rm tests gosec -exclude-dir=ssas ./...
+	docker-compose -f docker-compose.test.yml run --rm tests golangci-lint run --deadline=3m
+	docker-compose -f docker-compose.test.yml run --rm tests gosec ./...
 
-lint-ssas:
-	docker-compose -f docker-compose.test.yml run --rm tests golangci-lint run ./ssas/...
-	docker-compose -f docker-compose.test.yml run --rm tests gosec ./ssas/...
-
-# The following vars are available to tests needing SSAS admin credentials; currently they are used in smoke-test-ssas, postman-ssas, and unit-test-ssas
+# The following vars are available to tests needing SSAS admin credentials; currently they are used in smoke-test
 # Note that these variables should only be used for smoke tests, must be set before the api starts, and cannot be changed after the api starts
 SSAS_ADMIN_CLIENT_ID ?= 31e029ef-0e97-47f8-873c-0e8b7e7f99bf
-SSAS_ADMIN_CLIENT_SECRET := $(shell docker-compose run --rm ssas sh -c 'tmp/ssas-service --reset-secret --client-id=$(SSAS_ADMIN_CLIENT_ID)'|tail -n1)
+SSAS_ADMIN_CLIENT_SECRET := $(shell docker-compose run --rm ssas sh -c 'main --reset-secret --client-id=$(SSAS_ADMIN_CLIENT_ID)'|tail -n1)
 
 #
 # The following vars are used by both smoke-test and postman to pass credentials for obtaining an access token.
@@ -45,11 +41,7 @@ clientTemp := $(shell docker-compose run --rm api sh -c 'tmp/bcda reset-client-c
 CLIENT_ID ?= $(shell echo $(clientTemp) |awk '{print $$1}')
 CLIENT_SECRET ?= $(shell echo $(clientTemp) |awk '{print $$2}')
 smoke-test:
-	BCDA_SSAS_CLIENT_ID=$(SSAS_ADMIN_CLIENT_ID) BCDA_SSAS_SECRET=$(SSAS_ADMIN_CLIENT_SECRET) CLIENT_ID=$(CLIENT_ID) CLIENT_SECRET=$(CLIENT_SECRET) docker-compose -f docker-compose.test.yml run --rm -w /go/src/github.com/CMSgov/bcda-app/test/smoke_test tests sh smoke_test.sh
-
-smoke-test-ssas:
-	docker-compose -f docker-compose.test.yml run --rm postman_test test/postman_test/SSAS_Smoke_Test.postman_collection.json -e test/postman_test/ssas-local.postman_environment.json --global-var "token=$(token)" --global-var adminClientId=$(SSAS_ADMIN_CLIENT_ID) --global-var adminClientSecret=$(SSAS_ADMIN_CLIENT_SECRET)
-	BCDA_SSAS_CLIENT_ID=$(SSAS_ADMIN_CLIENT_ID) BCDA_SSAS_SECRET=$(SSAS_ADMIN_CLIENT_SECRET) test/smoke_test/ssas_test.sh
+	BCDA_SSAS_CLIENT_ID=$(SSAS_ADMIN_CLIENT_ID) BCDA_SSAS_SECRET=$(SSAS_ADMIN_CLIENT_SECRET) test/smoke_test/smoke_test.sh
 
 postman:
 	# This target should be executed by passing in an argument for the environment (dev/test/sbx)
@@ -58,17 +50,10 @@ postman:
 	# For example: make postman env=test token=<MY_TOKEN>
 	docker-compose -f docker-compose.test.yml run --rm postman_test test/postman_test/BCDA_Tests_Sequential.postman_collection.json -e test/postman_test/$(env).postman_environment.json --global-var "token=$(token)" --global-var clientId=$(CLIENT_ID) --global-var clientSecret=$(CLIENT_SECRET)
 
-postman-ssas:
-	docker-compose -f docker-compose.test.yml run --rm postman_test test/postman_test/SSAS.postman_collection.json -e test/postman_test/ssas-local.postman_environment.json --global-var adminClientId=$(SSAS_ADMIN_CLIENT_ID) --global-var adminClientSecret=$(SSAS_ADMIN_CLIENT_SECRET)
-
 unit-test:
 	docker-compose up -d db
 	docker-compose -f docker-compose.test.yml run --rm tests bash unit_test.sh
 
-unit-test-ssas:
-	docker-compose up -d db
-	docker-compose -f docker-compose.test.yml run --rm tests bash unit_test_ssas.sh
-
 performance-test:
 	docker-compose -f docker-compose.test.yml run --rm -w /go/src/github.com/CMSgov/bcda-app/test/performance_test tests sh performance_test.sh
 
@@ -78,12 +63,6 @@ test:
 	$(MAKE) postman env=local
 	$(MAKE) smoke-test
 
-test-ssas:
-	$(MAKE) lint-ssas
-	$(MAKE) unit-test-ssas
-	$(MAKE) postman-ssas
-	$(MAKE) smoke-test-ssas
-
 load-fixtures:
 	docker-compose up -d db
 	echo "Wait for database to be ready..."
@@ -109,9 +88,8 @@ load-synthetic-suppression-data:
 	docker-compose run api sh -c 'tmp/bcda import-suppression-directory --directory=../shared_files/synthetic1800MedicareFiles'
 
 load-fixtures-ssas:
-	docker-compose up -d db
-	docker-compose run ssas sh -c 'tmp/ssas-service --migrate'
-	docker-compose run ssas sh -c 'tmp/ssas-service --add-fixture-data'
+	docker-compose -f docker-compose.ssas-migrate.yml run --rm ssas-migrate -database "postgres://postgres:toor@db:5432/bcda?sslmode=disable" -path /go/src/github.com/CMSgov/bcda-ssas-app/db/migrations up
+	docker-compose run ssas sh -c 'main --add-fixture-data'
 
 docker-build:
 	docker-compose build --force-rm
@@ -141,4 +119,4 @@ debug-worker:
 	@-bash -c "trap 'docker-compose stop' EXIT; \
 		docker-compose -f docker-compose.yml -f docker-compose.debug.yml run --no-deps -T --rm -v $(shell pwd):/go/src/github.com/CMSgov/bcda-app worker dlv debug"
 
-.PHONY: docker-build docker-bootstrap load-fixtures load-synthetic-cclf-data load-synthetic-suppression-data test debug-api debug-worker api-shell worker-shell package release smoke-test postman unit-test performance-test lint
+.PHONY: api-shell debug-api debug-worker docker-bootstrap docker-build lint load-fixtures load-fixtures-ssas load-synthetic-cclf-data load-synthetic-suppression-data package performance-test postman release smoke-test test unit-test worker-shell

docker-compose.ssas-migrate.yml

@@ -0,0 +1,7 @@
+version: '3'
+
+services:
+  ssas-migrate:
+    build:
+      context: .
+      dockerfile: Dockerfiles/Dockerfile.ssas-migrate

docker-compose.test.yml

@@ -26,13 +26,8 @@ services:
       - OKTA_CLIENT_ORGURL=https://cms-sandbox.oktapreview.com
       - OKTA_EMAIL=shawn@bcda.aco-group.us
       - OKTA_CLIENT_TOKEN=${OKTA_CLIENT_TOKEN}
-      - OKTA_CA_CERT_FINGERPRINT=${OKTA_CA_CERT_FINGERPRINT}
       - BCDA_AUTH_PROVIDER=${BCDA_AUTH_PROVIDER}
       - OKTA_OAUTH_SERVER_ID=${OKTA_OAUTH_SERVER_ID}
-      - OKTA_MFA_EMAIL=${OKTA_MFA_EMAIL}
-      - OKTA_MFA_USER_ID=${OKTA_MFA_USER_ID}
-      - OKTA_MFA_USER_PASSWORD=${OKTA_MFA_USER_PASSWORD}
-      - OKTA_MFA_SMS_FACTOR_ID=${OKTA_MFA_SMS_FACTOR_ID}
       - CLIENT_ID
       - CLIENT_SECRET
       - BB_HASH_PEPPER=6E6F747468657265616C706570706572
@@ -43,24 +38,6 @@ services:
       - CCLF_IMPORT_STATUS_RECORDS_INTERVAL=10
       - BCDA_SSAS_CLIENT_ID=fake-client-id
       - BCDA_SSAS_SECRET=fake-secret
-      - SSAS_ADMIN_SIGNING_KEY_PATH=../../../shared_files/ssas/admin_test_signing_key.pem
-      - SSAS_PUBLIC_SIGNING_KEY_PATH=../../../shared_files/ssas/public_test_signing_key.pem
-      - SSAS_PUBLIC_PORT=:3003
-      - SSAS_ADMIN_PORT=:3004
-      - SSAS_HTTP_TO_HTTPS_PORT=:3005
-      - SSAS_READ_TIMEOUT=10
-      - SSAS_WRITE_TIMEOUT=20
-      - SSAS_IDLE_TIMEOUT=120
-      - SSAS_HASH_ITERATIONS=130000
-      - SSAS_HASH_KEY_LENGTH=64
-      - SSAS_HASH_SALT_SIZE=32
-      - SSAS_DEFAULT_SYSTEM_SCOPE=bcda-api
-      - SSAS_MFA_CHALLENGE_REQUEST_MILLISECONDS=0
-      - SSAS_MFA_TOKEN_TIMEOUT_MINUTES=60
-      - SSAS_MFA_PROVIDER=${SSAS_MFA_PROVIDER}
-      - SSAS_TOKEN_BLACKLIST_CACHE_CLEANUP_MINUTES=15
-      - SSAS_TOKEN_BLACKLIST_CACHE_TIMEOUT_MINUTES=1440
-      - SSAS_TOKEN_BLACKLIST_CACHE_REFRESH_MINUTES=5
       - SSAS_URL=http://ssas:3004
       - SSAS_PUBLIC_URL=http://ssas:3003
       - ENABLE_ENCRYPTION=false
@@ -72,15 +49,3 @@ services:
       dockerfile: Dockerfiles/Dockerfile.postman_test
     volumes:
        - .:/go/src/github.com/CMSgov/bcda-app
-  postman_test_ssas:
-    build:
-      context: .
-      dockerfile: Dockerfiles/Dockerfile.postman_test
-    volumes:
-        - .:/go/src/github.com/CMSgov/bcda-app
-  smoke_test_ssas:
-    build:
-      context: .
-      dockerfile: Dockerfiles/Dockerfile.postman_test
-    volumes:
-      - .:/go/src/github.com/CMSgov/bcda-app

docker-compose.yml

@@ -121,10 +121,6 @@ services:
       - BCDA_AUTH_PROVIDER=${BCDA_AUTH_PROVIDER}
       - OKTA_OAUTH_SERVER_ID=${OKTA_OAUTH_SERVER_ID}
       - OKTA_CA_CERT_FINGERPRINT=${OKTA_CA_CERT_FINGERPRINT}
-      - OKTA_MFA_EMAIL=${OKTA_MFA_EMAIL}
-      - OKTA_MFA_USER_ID=${OKTA_MFA_USER_ID}
-      - OKTA_MFA_USER_PASSWORD=${OKTA_MFA_USER_PASSWORD}
-      - OKTA_MFA_SMS_FACTOR_ID=${OKTA_MFA_SMS_FACTOR_ID}
       - BCDA_SSAS_CLIENT_ID=${BCDA_SSAS_CLIENT_ID}
       - BCDA_SSAS_SECRET=${BCDA_SSAS_SECRET}
       - SSAS_ADMIN_SIGNING_KEY_PATH=../shared_files/ssas/admin_test_signing_key.pem
@@ -150,4 +146,6 @@ services:
     ports:
       - "3003:3003"
       - "3004:3004"
-      - "3005:3005"
+      - "3005:3005"
+    depends_on:
+      - db

ops/build_and_package.sh

@@ -47,12 +47,6 @@ echo "Building bcdaworker..."
 go build
 echo "Packaging bcdaworker binary into RPM..."
 fpm -v $VERSION -s dir -t rpm -n bcdaworker bcdaworker=/usr/local/bin/bcdaworker
-cd ../ssas
-go clean
-echo "Building ssas..."
-go build -o ssas ./service/main
-echo "Packaging ssas binary into RPM..."
-fpm -v $VERSION -s dir -t rpm -n ssas ssas=/usr/local/bin/ssas
 
 #Sign RPMs
 echo "Importing GPG Key files"
@@ -77,12 +71,3 @@ echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf
 echo "Signing bcdaworker RPM"
 echo $WORKER_RPM
 echo $BCDA_GPG_RPM_PASSPHRASE | gpg --batch --yes --passphrase-fd 0 --pinentry-mode loopback --sign $WORKER_RPM
-
-cd ../ssas
-SSAS_RPM="ssas-*.rpm"
-echo "%_signature gpg %_gpg_path $PWD %_gpg_name $GPG_RPM_USER %_gpgbin /usr/bin/gpg" > $PWD/.rpmmacros
-echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf
-
-echo "Signing ssas RPM"
-echo $SSAS_RPM
-echo $BCDA_GPG_RPM_PASSPHRASE | gpg --batch --yes --passphrase-fd 0 --pinentry-mode loopback --sign $SSAS_RPM