Skip to content

Commit

Permalink
Use v0.8.0 (#57)
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua Timmons authored Sep 16, 2022
1 parent 4c713ce commit 67ed7d6
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions examples/hcp-ec2-demo/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = module.vpc.vpc_id
Expand Down Expand Up @@ -65,7 +65,7 @@ resource "local_file" "ssh_key" {

module "aws_ec2_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ec2-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

ssh_keyname = var.ssh ? aws_key_pair.hcp_ec2[0].key_name : ""
subnet_id = module.vpc.public_subnets[0]
Expand Down
4 changes: 2 additions & 2 deletions examples/hcp-ecs-demo/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = module.vpc.vpc_id
Expand All @@ -49,7 +49,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "aws_ecs_cluster" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ecs-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

private_subnet_ids = module.vpc.private_subnets
public_subnet_ids = module.vpc.public_subnets
Expand Down
6 changes: 3 additions & 3 deletions examples/hcp-eks-demo/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = module.vpc.vpc_id
Expand All @@ -85,7 +85,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "eks_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-eks-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

cluster_id = hcp_consul_cluster.main.cluster_id
consul_hosts = jsondecode(base64decode(hcp_consul_cluster.main.consul_config_file))["retry_join"]
Expand All @@ -106,7 +106,7 @@ module "eks_consul_client" {
module "demo_app" {
count = var.install_demo_app ? 1 : 0
source = "hashicorp/hcp-consul/aws//modules/k8s-demo-app"
version = "~> 0.7.3"
version = "~> 0.8.0"

depends_on = [module.eks_consul_client]
}
4 changes: 2 additions & 2 deletions hcp-ui-templates/ec2-existing-vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = local.vpc_id
Expand Down Expand Up @@ -83,7 +83,7 @@ resource "local_file" "ssh_key" {

module "aws_ec2_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ec2-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

ssh_keyname = local.ssh ? aws_key_pair.hcp_ec2[0].key_name : ""
subnet_id = local.public_subnet1
Expand Down
4 changes: 2 additions & 2 deletions hcp-ui-templates/ec2/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = module.vpc.vpc_id
Expand Down Expand Up @@ -98,7 +98,7 @@ resource "local_file" "ssh_key" {

module "aws_ec2_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ec2-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

ssh_keyname = local.ssh ? aws_key_pair.hcp_ec2[0].key_name : ""
subnet_id = module.vpc.public_subnets[0]
Expand Down
4 changes: 2 additions & 2 deletions hcp-ui-templates/ecs-existing-vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = local.vpc_id
Expand All @@ -66,7 +66,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "aws_ecs_cluster" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ecs-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

private_subnet_ids = [local.private_subnet1, local.private_subnet2]
public_subnet_ids = [local.public_subnet1, local.public_subnet2]
Expand Down
4 changes: 2 additions & 2 deletions hcp-ui-templates/ecs/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = module.vpc.vpc_id
Expand All @@ -81,7 +81,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "aws_ecs_cluster" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ecs-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

private_subnet_ids = module.vpc.private_subnets
public_subnet_ids = module.vpc.public_subnets
Expand Down
6 changes: 3 additions & 3 deletions hcp-ui-templates/eks-existing-vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = local.vpc_id
Expand All @@ -131,7 +131,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "eks_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-eks-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

cluster_id = hcp_consul_cluster.main.cluster_id
consul_hosts = jsondecode(base64decode(hcp_consul_cluster.main.consul_config_file))["retry_join"]
Expand All @@ -152,7 +152,7 @@ module "eks_consul_client" {
module "demo_app" {
count = local.install_demo_app ? 1 : 0
source = "hashicorp/hcp-consul/aws//modules/k8s-demo-app"
version = "~> 0.7.3"
version = "~> 0.8.0"

depends_on = [module.eks_consul_client]
}
Expand Down
6 changes: 3 additions & 3 deletions hcp-ui-templates/eks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = module.vpc.vpc_id
Expand All @@ -148,7 +148,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "eks_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-eks-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

cluster_id = hcp_consul_cluster.main.cluster_id
consul_hosts = jsondecode(base64decode(hcp_consul_cluster.main.consul_config_file))["retry_join"]
Expand All @@ -169,7 +169,7 @@ module "eks_consul_client" {
module "demo_app" {
count = local.install_demo_app ? 1 : 0
source = "hashicorp/hcp-consul/aws//modules/k8s-demo-app"
version = "~> 0.7.3"
version = "~> 0.8.0"

depends_on = [module.eks_consul_client]
}
Expand Down
4 changes: 2 additions & 2 deletions scripts/module_version.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

old="0\.7\.2"
new=0.7.3
old="0\.7\.3"
new=0.8.0

for platform in ec2 ecs eks; do
file=examples/hcp-$platform-demo/main.tf
Expand Down
4 changes: 2 additions & 2 deletions test/hcp/testdata/ec2-existing-vpc.golden
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = local.vpc_id
Expand Down Expand Up @@ -83,7 +83,7 @@ resource "local_file" "ssh_key" {

module "aws_ec2_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ec2-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

ssh_keyname = local.ssh ? aws_key_pair.hcp_ec2[0].key_name : ""
subnet_id = local.public_subnet1
Expand Down
4 changes: 2 additions & 2 deletions test/hcp/testdata/ec2.golden
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = module.vpc.vpc_id
Expand Down Expand Up @@ -98,7 +98,7 @@ resource "local_file" "ssh_key" {

module "aws_ec2_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ec2-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

ssh_keyname = local.ssh ? aws_key_pair.hcp_ec2[0].key_name : ""
subnet_id = module.vpc.public_subnets[0]
Expand Down
4 changes: 2 additions & 2 deletions test/hcp/testdata/ecs-existing-vpc.golden
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = local.vpc_id
Expand All @@ -66,7 +66,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "aws_ecs_cluster" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ecs-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

private_subnet_ids = [local.private_subnet1, local.private_subnet2]
public_subnet_ids = [local.public_subnet1, local.public_subnet2]
Expand Down
4 changes: 2 additions & 2 deletions test/hcp/testdata/ecs.golden
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = module.vpc.vpc_id
Expand All @@ -81,7 +81,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "aws_ecs_cluster" {
source = "hashicorp/hcp-consul/aws//modules/hcp-ecs-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

private_subnet_ids = module.vpc.private_subnets
public_subnet_ids = module.vpc.public_subnets
Expand Down
6 changes: 3 additions & 3 deletions test/hcp/testdata/eks-existing-vpc.golden
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = local.vpc_id
Expand All @@ -131,7 +131,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "eks_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-eks-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

cluster_id = hcp_consul_cluster.main.cluster_id
consul_hosts = jsondecode(base64decode(hcp_consul_cluster.main.consul_config_file))["retry_join"]
Expand All @@ -152,7 +152,7 @@ module "eks_consul_client" {
module "demo_app" {
count = local.install_demo_app ? 1 : 0
source = "hashicorp/hcp-consul/aws//modules/k8s-demo-app"
version = "~> 0.7.3"
version = "~> 0.8.0"

depends_on = [module.eks_consul_client]
}
Expand Down
6 changes: 3 additions & 3 deletions test/hcp/testdata/eks.golden
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ resource "hcp_hvn" "main" {

module "aws_hcp_consul" {
source = "hashicorp/hcp-consul/aws"
version = "~> 0.7.3"
version = "~> 0.8.0"

hvn = hcp_hvn.main
vpc_id = module.vpc.vpc_id
Expand All @@ -148,7 +148,7 @@ resource "hcp_consul_cluster_root_token" "token" {

module "eks_consul_client" {
source = "hashicorp/hcp-consul/aws//modules/hcp-eks-client"
version = "~> 0.7.3"
version = "~> 0.8.0"

cluster_id = hcp_consul_cluster.main.cluster_id
consul_hosts = jsondecode(base64decode(hcp_consul_cluster.main.consul_config_file))["retry_join"]
Expand All @@ -169,7 +169,7 @@ module "eks_consul_client" {
module "demo_app" {
count = local.install_demo_app ? 1 : 0
source = "hashicorp/hcp-consul/aws//modules/k8s-demo-app"
version = "~> 0.7.3"
version = "~> 0.8.0"

depends_on = [module.eks_consul_client]
}
Expand Down

0 comments on commit 67ed7d6

Please sign in to comment.