Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove back quote from comment and bump release version #77

Merged
merged 1 commit into from
Dec 2, 2022
Merged

Remove back quote from comment and bump release version #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/hcp-ec2-demo/main.tf
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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

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

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
4 changes: 2 additions & 2 deletions examples/hcp-ecs-demo/main.tf
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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.9.0"
version = "~> 0.9.1"

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
8 changes: 4 additions & 4 deletions examples/hcp-eks-demo/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ resource "hcp_hvn" "main" {
# Note: Uncomment the below module to setup peering for connecting to a private HCP Consul cluster
# module "aws_hcp_consul" {
# source = "hashicorp/hcp-consul/aws"
# version = "~> 0.9.0"
# version = "~> 0.9.1"
#
# hvn = hcp_hvn.main
# vpc_id = module.vpc.vpc_id
Expand All @@ -88,11 +88,11 @@ resource "hcp_consul_cluster_root_token" "token" {

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

boostrap_acl_token = hcp_consul_cluster_root_token.token.secret_id
cluster_id = hcp_consul_cluster.main.cluster_id
# strip out `https://` from the public url
# strip out url scheme from the public url
consul_hosts = tolist([substr(hcp_consul_cluster.main.consul_public_endpoint_url, 8, -1)])
consul_version = hcp_consul_cluster.main.consul_version
datacenter = hcp_consul_cluster.main.datacenter
Expand All @@ -107,7 +107,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.9.0"
version = "~> 0.9.1"

depends_on = [module.eks_consul_client]
}
4 changes: 2 additions & 2 deletions hcp-ui-templates/ec2-existing-vpc/main.tf
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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

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

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
4 changes: 2 additions & 2 deletions hcp-ui-templates/ec2/main.tf
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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

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

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
4 changes: 2 additions & 2 deletions hcp-ui-templates/ecs-existing-vpc/main.tf
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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.9.0"
version = "~> 0.9.1"

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
4 changes: 2 additions & 2 deletions hcp-ui-templates/ecs/main.tf
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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.9.0"
version = "~> 0.9.1"

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
8 changes: 4 additions & 4 deletions hcp-ui-templates/eks-existing-vpc/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ resource "hcp_hvn" "main" {
# Note: Uncomment the below module to setup peering for connecting to a private HCP Consul cluster
# module "aws_hcp_consul" {
# source = "hashicorp/hcp-consul/aws"
# version = "~> 0.9.0"
# version = "~> 0.9.1"
#
# hvn = hcp_hvn.main
# vpc_id = local.vpc_id
Expand All @@ -133,11 +133,11 @@ resource "hcp_consul_cluster_root_token" "token" {

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

boostrap_acl_token = hcp_consul_cluster_root_token.token.secret_id
cluster_id = hcp_consul_cluster.main.cluster_id
# strip out `https://` from the public url
# strip out url scheme from the public url
consul_hosts = tolist([substr(hcp_consul_cluster.main.consul_public_endpoint_url, 8, -1)])
consul_version = hcp_consul_cluster.main.consul_version
datacenter = hcp_consul_cluster.main.datacenter
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.9.0"
version = "~> 0.9.1"

depends_on = [module.eks_consul_client]
}
Expand Down
8 changes: 4 additions & 4 deletions hcp-ui-templates/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ resource "hcp_hvn" "main" {
# Note: Uncomment the below module to setup peering for connecting to a private HCP Consul cluster
# module "aws_hcp_consul" {
# source = "hashicorp/hcp-consul/aws"
# version = "~> 0.9.0"
# version = "~> 0.9.1"
#
# hvn = hcp_hvn.main
# vpc_id = module.vpc.vpc_id
Expand All @@ -151,11 +151,11 @@ resource "hcp_consul_cluster_root_token" "token" {

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

boostrap_acl_token = hcp_consul_cluster_root_token.token.secret_id
cluster_id = hcp_consul_cluster.main.cluster_id
# strip out `https://` from the public url
# strip out url scheme from the public url
consul_hosts = tolist([substr(hcp_consul_cluster.main.consul_public_endpoint_url, 8, -1)])
consul_version = hcp_consul_cluster.main.consul_version
datacenter = hcp_consul_cluster.main.datacenter
Expand All @@ -170,7 +170,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.9.0"
version = "~> 0.9.1"

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

old="0\.8\.10"
new=0.9.0
old="0\.9\.0"
new=0.9.1

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
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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

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

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
4 changes: 2 additions & 2 deletions test/hcp/testdata/ec2.golden
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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

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

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
4 changes: 2 additions & 2 deletions test/hcp/testdata/ecs-existing-vpc.golden
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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.9.0"
version = "~> 0.9.1"

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
4 changes: 2 additions & 2 deletions test/hcp/testdata/ecs.golden
View file
Open in desktop
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.9.0"
version = "~> 0.9.1"

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.9.0"
version = "~> 0.9.1"

allowed_http_cidr_blocks = ["0.0.0.0/0"]
allowed_ssh_cidr_blocks = ["0.0.0.0/0"]
Expand Down
8 changes: 4 additions & 4 deletions test/hcp/testdata/eks-existing-vpc.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ resource "hcp_hvn" "main" {
# Note: Uncomment the below module to setup peering for connecting to a private HCP Consul cluster
# module "aws_hcp_consul" {
# source = "hashicorp/hcp-consul/aws"
# version = "~> 0.9.0"
# version = "~> 0.9.1"
#
# hvn = hcp_hvn.main
# vpc_id = local.vpc_id
Expand All @@ -133,11 +133,11 @@ resource "hcp_consul_cluster_root_token" "token" {

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

boostrap_acl_token = hcp_consul_cluster_root_token.token.secret_id
cluster_id = hcp_consul_cluster.main.cluster_id
# strip out `https://` from the public url
# strip out url scheme from the public url
consul_hosts = tolist([substr(hcp_consul_cluster.main.consul_public_endpoint_url, 8, -1)])
consul_version = hcp_consul_cluster.main.consul_version
datacenter = hcp_consul_cluster.main.datacenter
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.9.0"
version = "~> 0.9.1"

depends_on = [module.eks_consul_client]
}
Expand Down
8 changes: 4 additions & 4 deletions test/hcp/testdata/eks.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ resource "hcp_hvn" "main" {
# Note: Uncomment the below module to setup peering for connecting to a private HCP Consul cluster
# module "aws_hcp_consul" {
# source = "hashicorp/hcp-consul/aws"
# version = "~> 0.9.0"
# version = "~> 0.9.1"
#
# hvn = hcp_hvn.main
# vpc_id = module.vpc.vpc_id
Expand All @@ -151,11 +151,11 @@ resource "hcp_consul_cluster_root_token" "token" {

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

boostrap_acl_token = hcp_consul_cluster_root_token.token.secret_id
cluster_id = hcp_consul_cluster.main.cluster_id
# strip out `https://` from the public url
# strip out url scheme from the public url
consul_hosts = tolist([substr(hcp_consul_cluster.main.consul_public_endpoint_url, 8, -1)])
consul_version = hcp_consul_cluster.main.consul_version
datacenter = hcp_consul_cluster.main.datacenter
Expand All @@ -170,7 +170,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.9.0"
version = "~> 0.9.1"

depends_on = [module.eks_consul_client]
}
Expand Down