Skip to content

Commit

Permalink
Merge pull request #62 from transcend-io/dmattia/pin_vault_provider
Browse files Browse the repository at this point in the history
Pin vault provider to version that doesn't greedily check token validation
  • Loading branch information
dmattia authored Oct 5, 2023
2 parents fb7bc3e + c6f75fb commit 009636f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
"features": {
"terraform": "1.2",
"terraform": "1.6",
"aws-cli": "latest"
}
}
5 changes: 3 additions & 2 deletions examples/http/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ provider "vault" {
token = "not-a-real-token"
skip_tls_verify = true
skip_child_token = true
skip_get_vault_version = true
}

locals {
Expand All @@ -25,7 +26,7 @@ locals {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 2.18.0"
version = "~> 5.1.2"

name = "sombra-example-http-test-vpc"
cidr = "10.0.0.0/16"
Expand All @@ -52,7 +53,7 @@ module "acm" {

module "sombra" {
source = "transcend-io/sombra/aws"
version = "1.4.1"
version = "1.5.0"

# General Settings
deploy_env = "example"
Expand Down
5 changes: 3 additions & 2 deletions examples/https/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ provider "vault" {
token = "not-a-real-token"
skip_tls_verify = true
skip_child_token = true
skip_get_vault_version = true
}

locals {
Expand All @@ -25,7 +26,7 @@ locals {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 2.18.0"
version = "~> 5.1.2"

name = "sombra-example-https-test-vpc"
cidr = "10.0.0.0/16"
Expand All @@ -52,7 +53,7 @@ module "acm" {

module "sombra" {
source = "transcend-io/sombra/aws"
version = "1.4.1"
version = "1.5.0"

# General Settings
deploy_env = "example"
Expand Down
4 changes: 2 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ locals {

module "service" {
source = "transcend-io/fargate-service/aws"
version = "0.8.0"

version = "0.9.0"
name = "${var.deploy_env}-${var.project_id}-sombra-service"
cpu = var.cpu
memory = var.memory
Expand Down
6 changes: 6 additions & 0 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ terraform {
aws = {
source = "hashicorp/aws"
}
# We cannot use versions 3.16.0 or higher due to this regression:
# https://github.com/hashicorp/terraform-provider-vault/issues/1907
vault = {
source = "hashicorp/vault"
version = "< 3.16.0"
}
}
required_version = ">= 0.13"
}

0 comments on commit 009636f

Please sign in to comment.