WIP - Agent auth

.drone.yml

@@ -18,6 +18,7 @@ steps:
       DB_HOST: postgres
       DB_PORT: 5432
       USE_K8S: false
+      ENABLE_AUTH: false
 
 trigger:
   branch:

Makefile

@@ -28,7 +28,7 @@ lint:
 	golangci-lint run -v
 
 .PHONY: build
-build: lint unit-test build-minimal
+build: unit-test build-minimal
 
 build-minimal: create-build-dir
 	CGO_ENABLED=0 go build -o $(BUILD_FOLDER)/bm-inventory cmd/main.go
@@ -45,10 +45,10 @@ generate:
 generate-from-swagger:
 	rm -rf client models restapi
 	docker run -u $(UID):$(UID) -v $(PWD):$(PWD):rw,Z -v /etc/passwd:/etc/passwd -w $(PWD) \
-		quay.io/goswagger/swagger:v0.24.0 generate server	--template=stratoscale -f swagger.yaml \
+		quay.io/goswagger/swagger:v0.25.0 generate server	--template=stratoscale -f swagger.yaml \
 		--template-dir=/templates/contrib
 	docker run -u $(UID):$(UID) -v $(PWD):$(PWD):rw,Z -v /etc/passwd:/etc/passwd -w $(PWD) \
-		quay.io/goswagger/swagger:v0.24.0 generate client	--template=stratoscale -f swagger.yaml \
+		quay.io/goswagger/swagger:v0.25.0 generate client	--template=stratoscale -f swagger.yaml \
 		--template-dir=/templates/contrib
 
 ##########
@@ -118,7 +118,7 @@ deploy-inventory-service-file: deploy-namespace
 	sleep 5;  # wait for service to get an address
 
 deploy-service-requirements: deploy-namespace deploy-inventory-service-file
-	python3 ./tools/deploy_assisted_installer_configmap.py --target "$(TARGET)" --domain "$(INGRESS_DOMAIN)" --base-dns-domains "$(BASE_DNS_DOMAINS)" --namespace "$(NAMESPACE)" $(DEPLOY_TAG_OPTION)
+	python3 ./tools/deploy_assisted_installer_configmap.py --target "$(TARGET)" --domain "$(INGRESS_DOMAIN)" --base-dns-domains "$(BASE_DNS_DOMAINS)" --namespace "$(NAMESPACE)" $(DEPLOY_TAG_OPTION) --enable-auth "$(ENABLE_AUTH)"
 
 deploy-service: deploy-namespace deploy-service-requirements deploy-role
 	python3 ./tools/deploy_assisted_installer.py $(DEPLOY_TAG_OPTION) --namespace "$(NAMESPACE)" $(TEST_FLAGS)
@@ -130,20 +130,25 @@ deploy-role: deploy-namespace
 deploy-postgres: deploy-namespace
 	python3 ./tools/deploy_postgres.py --namespace "$(NAMESPACE)"
 
-deploy-test:
-	export SERVICE=quay.io/ocpmetal/bm-inventory:test && export TEST_FLAGS=--subsystem-test && \
-	$(MAKE) update-minikube deploy-all
+deploy-test: generate-keys
+	export SERVICE=quay.io/ocpmetal/bm-inventory:test && export TEST_FLAGS=--subsystem-test && export ENABLE_AUTH="True" \
+	&& $(MAKE) update-minikube deploy-all
 
 ########
 # Test #
 ########
 
 subsystem-run: test subsystem-clean
 
-test:
+generate-keys:
+	cd tools && rm -f auth-test.json auth-test-pub.json auth-tokenString  && go run auth_keys_generator.go
+
+test: generate-keys
 	INVENTORY=$(shell $(call get_service,bm-inventory) | sed 's/http:\/\///g') \
 		DB_HOST=$(shell $(call get_service,postgres) | sed 's/http:\/\///g' | cut -d ":" -f 1) \
 		DB_PORT=$(shell $(call get_service,postgres) | sed 's/http:\/\///g' | cut -d ":" -f 2) \
+		TEST_TOKEN="$(shell cat tools/auth-tokenString)" \
+		ENABLE_AUTH="true" \
 		go test -v ./subsystem/... -count=1 -ginkgo.focus=${FOCUS} -ginkgo.v -timeout 20m
 
 deploy-olm: deploy-namespace