Skip to content

Commit 47e8f4a

Browse files
authored
Fix vault-config update-yml (#632)
* Fix vault-config update-yml * Update to latest TF node module * Update CI to TF 1.9.6
1 parent b446c03 commit 47e8f4a

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ commands:
6161
- run:
6262
name: Create Infrastructure
6363
command: |
64-
tfenv use 1.1.4
64+
tfenv use 1.9.6
6565
make integration-tests-init TF_VAR_envid="tf_test_${CIRCLE_JOB}_${CIRCLE_SHA1}"
6666
- run:
6767
name: Health Checks

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM alpine:3.17
44
# Some of the playbooks run on multiple hosts: local + remote.
55
# If it's set in the inventory it will not work when a specific inventory is used.
66
# OpenSSL required for a packer workaround: https://github.com/hashicorp/packer/issues/2526
7-
RUN apk add --no-cache bash curl unzip make python3 py3-pip py-cryptography openssh-client openssl sshpass jq bc git
7+
RUN apk add --no-cache bash curl unzip make python3 py3-pip py-cryptography openssh-client openssl sshpass jq yq bc git
88

99
ENV PACKER_VERSION=1.11.1
1010
RUN curl -sSO https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip \

scripts/vault-config.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ dump() {
152152
dump_yml_value() {
153153
local config_path=${1:?}
154154

155-
yq r "${config_path}/${YAML_FILE:?}" "${YAML_PATH:?}"
155+
yq "${YAML_PATH:?}" "${config_path}/${YAML_FILE:?}"
156156
}
157157

158158
dump_yml() {
@@ -190,8 +190,8 @@ update() {
190190
update_yml_value() {
191191
local config_path=${1:?}
192192

193-
yq r "${config_path}/${YAML_FILE:?}" "${YAML_PATH:?}" "${YAML_VALUE:?}"
194-
yq w -i "${config_path}/${YAML_FILE:?}" "${YAML_PATH:?}" "${YAML_VALUE:?}"
193+
yq "${YAML_PATH:?}" "${config_path}/${YAML_FILE:?}"
194+
yq -i "${YAML_PATH:?}"' = "'"${YAML_VALUE:?}"'"' "${config_path}/${YAML_FILE:?}"
195195
}
196196

197197
update_yml() {

test/terraform/.terraform-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.4
1+
1.9.6

test/terraform/terraform.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = "1.1.4"
2+
required_version = "1.9.6"
33
required_providers {
44
aws = {
55
version = "5.12.0"

test/terraform/test.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ provider "aws" {
2020
}
2121

2222
module "test-aenode-2204" {
23-
source = "github.com/aeternity/terraform-aws-aenode-deploy?ref=v3.1.0"
23+
source = "github.com/aeternity/terraform-aws-aenode-deploy?ref=v4.0.0"
2424
env = var.env_name
2525

2626
static_nodes = 1
@@ -53,7 +53,7 @@ module "test-aenode-2204" {
5353
}
5454

5555
module "test-aemdw-2204" {
56-
source = "github.com/aeternity/terraform-aws-aenode-deploy?ref=v3.1.0"
56+
source = "github.com/aeternity/terraform-aws-aenode-deploy?ref=v4.0.0"
5757
env = var.env_name
5858

5959
static_nodes = 1

0 commit comments

Comments
 (0)