Skip to content

Commit 37159d0

Browse files
0x07C00x07C0
committed
fix: remove old key format from makefile
1 parent cc7fc31 commit 37159d0

File tree

3 files changed

+21
-43
lines changed

3 files changed

+21
-43
lines changed

‎module/move/willbe/template/deploy/Makefile.hbs‎

Lines changed: 15 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
.PHONY: deploy
22

3-
# Secrets that can be provided via ENV vars or files in ./key/ directory.
4-
5-
# Hetzner API token
6-
export SECRET_CSP_HETZNER ?= $(shell cat key/SECRET_CSP_HETZNER 2> /dev/null)
7-
# Cloud Storage file encryption key
8-
export SECRET_STATE_ARCHIVE_KEY ?= $(shell cat key/SECRET_STATE_ARCHIVE_KEY 2> /dev/null)
9-
# AWS Access Key id
10-
export SECRET_AWS_ACCESS_KEY_ID ?= $(shell cat key/SECRET_AWS_ACCESS_KEY_ID 2> /dev/null)
11-
# AWS Access Key
12-
export SECRET_AWS_ACCESS_KEY ?= $(shell cat key/SECRET_AWS_ACCESS_KEY 2> /dev/null)
13-
143
# Configuration variables for deployment. Can be edited for desired behavior.
154

165
# Base terraform directory
@@ -24,7 +13,7 @@ export TF_VAR_REPO_NAME ?= {{gcp_artifact_repo_name}}
2413
# Pushed image name
2514
export TF_VAR_IMAGE_NAME ?= {{docker_image_name}}
2615
# Path to the service account credentials
27-
export google_sa_creds ?= key/service_account.json
16+
export google_sa_creds ?= key/-service_account.json
2817
# Cloud Storage bucket name
2918
export TF_VAR_BUCKET_NAME ?= {{docker_image_name}}_tfstate
3019
# Specifies where to deploy the project. Possible values: `hetzner`, `gce`, `aws`
@@ -45,40 +34,29 @@ export AWS_SECRET_ACCESS_KEY ?= $(SECRET_AWS_ACCESS_KEY)
4534

4635
# Check Hetzner and deployment related keys
4736
check-hetzner-keys:
48-
@[ -f key/SECRET_CSP_HETZNER ] \
49-
|| [ ! -z "${SECRET_CSP_HETZNER}" ] \
50-
|| { echo "ERROR: File key/SECRET_CSP_HETZNER does not exist"; exit 1; }
37+
@[ ! -z "${SECRET_CSP_HETZNER}" ] \
38+
|| { echo "ERROR: Key SECRET_CSP_HETZNER does not exist"; exit 1; }
5139

5240
# Check AWS and deployment related keys
5341
check-aws-keys:
54-
@[ -f key/SECRET_AWS_ACCESS_KEY_ID ] \
55-
|| [ ! -z "${SECRET_AWS_ACCESS_KEY_ID}" ] \
56-
|| echo "ERROR: File key/SECRET_AWS_ACCESS_KEY_ID does not exist"
57-
@[ -f key/SECRET_AWS_ACCESS_KEY ] \
58-
|| [ ! -z "${SECRET_AWS_ACCESS_KEY}" ] \
59-
|| echo "ERROR: File key/SECRET_AWS_ACCESS_KEY does not exist"
60-
@[ -f key/SECRET_AWS_ACCESS_KEY_ID ] \
61-
|| [ ! -z "${SECRET_AWS_ACCESS_KEY_ID}" ] \
62-
|| exit 1
63-
@[ -f key/SECRET_AWS_ACCESS_KEY ] \
64-
|| [ ! -z "${SECRET_AWS_ACCESS_KEY}" ] \
65-
|| exit 1
42+
@[ ! -z "${SECRET_AWS_ACCESS_KEY_ID}" ] \
43+
|| echo "ERROR: Key SECRET_AWS_ACCESS_KEY_ID does not exist"
44+
@[ ! -z "${SECRET_AWS_ACCESS_KEY}" ] \
45+
|| echo "ERROR: Key SECRET_AWS_ACCESS_KEY does not exist"
46+
@[ ! -z "${SECRET_AWS_ACCESS_KEY_ID}" ] || exit 1
47+
@[ ! -z "${SECRET_AWS_ACCESS_KEY}" ] || exit 1
6648

6749
check-gce-keys:
6850
@echo "All required GCE keys are the same as GCP keys"
6951

7052
# Check if required GCP keys are present
7153
check-gcp-keys:
72-
@[ -f key/service_account.json ] \
73-
|| echo "ERROR: File key/service_account.json does not exist"
74-
@[ -f key/SECRET_STATE_ARCHIVE_KEY ] \
75-
|| [ ! -z "${SECRET_STATE_ARCHIVE_KEY}" ] \
76-
|| echo "ERROR: File key/SECRET_STATE_ARCHIVE_KEY does not exist"
77-
@[ -f key/service_account.json ] \
78-
|| exit 1
79-
@[ -f key/SECRET_STATE_ARCHIVE_KEY ] \
80-
|| [ ! -z "${SECRET_STATE_ARCHIVE_KEY}" ] \
81-
|| exit 1
54+
@[ -f key/-service_account.json ] \
55+
|| echo "ERROR: Key file key/-service_account.json does not exist"
56+
@[ ! -z "${SECRET_STATE_ARCHIVE_KEY}" ] \
57+
|| echo "ERROR: Key SECRET_STATE_ARCHIVE_KEY does not exist"
58+
@[ -f key/-service_account.json ] || exit 1
59+
@[ ! -z "${SECRET_STATE_ARCHIVE_KEY}" ] || exit 1
8260

8361
# Start local docker container
8462
start:

‎module/move/willbe/template/deploy/deploy/aws/variables.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ variable "IMAGE_NAME" {
2020

2121
# Google Cloud Platform credentials
2222
data "local_sensitive_file" "service_account_creds" {
23-
filename = "${path.module}/../../key/service_account.json"
23+
filename = "${path.module}/../../key/-service_account.json"
2424
}
2525

2626
# Private key for SSH connection
2727
data "local_sensitive_file" "ssh_private_key" {
28-
filename = "${path.module}/../../key/rsa_ssh_key"
28+
filename = "${path.module}/../../key/-rsa_ssh_key"
2929
}
3030

3131
# Public key for SSH connection
3232
data "local_sensitive_file" "ssh_public_key" {
33-
filename = "${path.module}/../../key/rsa_ssh_key.pub"
33+
filename = "${path.module}/../../key/-rsa_ssh_key.pub"
3434
}

‎module/move/willbe/template/deploy/deploy/hetzner/variables.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ variable "IMAGE_NAME" {
2525

2626
# Google Cloud Platform credentials
2727
data "local_sensitive_file" "service_account_creds" {
28-
filename = "${path.module}/../../key/service_account.json"
28+
filename = "${path.module}/../../key/-service_account.json"
2929
}
3030

3131
# Private key for SSH connection
3232
data "local_sensitive_file" "ssh_private_key" {
33-
filename = "${path.module}/../../key/rsa_ssh_key"
33+
filename = "${path.module}/../../key/-rsa_ssh_key"
3434
}
3535

3636
# Public key for SSH connection
3737
data "local_sensitive_file" "ssh_public_key" {
38-
filename = "${path.module}/../../key/rsa_ssh_key.pub"
38+
filename = "${path.module}/../../key/-rsa_ssh_key.pub"
3939
}

0 commit comments

Comments
 (0)