fix makefiles (#1831)

Author: brushknight

Makefile

@@ -31,6 +31,7 @@ include $(INCLUDE_BUILD_DIR)/ci.mk
 include $(INCLUDE_BUILD_DIR)/release.mk
 
 # test
+include $(INCLUDE_TEST_DIR)/common.mk
 include $(INCLUDE_TEST_DIR)/test.mk
 
 # tools

test/ansible/Ansible.common renamed to test/ansible/common.mk

@@ -1,5 +1,5 @@
 # Include Ansible dependencies common installation strategy
-include ../ansible/Ansible.common
+include ../ansible/common.mk
 
 ANSIBLE_FOLDER := $(CURDIR)
 ANSIBLE_FORKS ?= 20

test/canaries/Makefile

@@ -1,5 +1,6 @@
 # Include AWS common features
-include ../../ansible/Ansible.common
+include ../../ansible/common.mk
+include ../../common.mk
 
 PROVISION_ALERTS_TERRAFORM_WORKSPACE	?= $(CURDIR)
 

test/canaries/alerts/Makefile

@@ -0,0 +1,7 @@
+.PHONY: validate-aws-credentials
+validate-aws-credentials:
+	@ACC_ID="$$(aws sts get-caller-identity --output text|awk '{print $$1}')"; \
+	if [ "$${ACC_ID}" != "$(AWS_ACCOUNT_ID)" ]; then \
+		echo "Invalid AWS account ID. Expected: $(AWS_ACCOUNT_ID), got: $${ACC_ID}."; \
+		exit 1; \
+	fi

test/common.mk

@@ -1,5 +1,5 @@
 # Include Ansible dependencies common installation strategy
-include ../ansible/Ansible.common
+include ../ansible/common.mk
 
 CROWDSTRIKE_REPO_SSH_KEY ?= $(HOME)/.ssh/crowdstrike_ansible_role_key
 TERRAFORM_DIR := ./terraform

test/provision/Makefile

@@ -1,4 +1,4 @@
-include $(CURDIR)/test/ansible/Ansible.common
+include $(CURDIR)/test/ansible/common.mk
 
 PROVISION_HOST_PREFIX := $(shell whoami)-$(shell hostname)
 AWS_ACCOUNT_ID = "018789649883"# CAOS
@@ -52,11 +52,3 @@ ifndef AGENT_VERSION
 else
 	bash $(CURDIR)/test/packaging/docker.sh
 endif
-
-.PHONY: validate-aws-credentials
-validate-aws-credentials:
-	@ACC_ID="$$(aws sts get-caller-identity --output text|awk '{print $$1}')"; \
-	if [ "$${ACC_ID}" != "$(AWS_ACCOUNT_ID)" ]; then \
-		echo "Invalid AWS account ID. Expected: $(AWS_ACCOUNT_ID), got: $${ACC_ID}."; \
-		exit 1; \
-	fi